diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index ce3f716312..107d828458 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -10,6 +10,8 @@ define(function() {
 				modified_categories[cid] = modified_categories[cid] || {};
 				modified_categories[cid][$(el).attr('data-name')] = $(el).val();
 			}
+
+			console.log(modified_categories);
 		}
 
 		function save() {
@@ -129,7 +131,7 @@ define(function() {
 				update_blockclass(ev.target);
 			});
 
-			jQuery('.category_name, .category_description, .blockclass').on('change', function(ev) {
+			jQuery('.category_name, .category_description, .blockclass .category_bgColor').on('change', function(ev) {
 				modified(ev.target);
 			});
 
@@ -156,6 +158,20 @@ define(function() {
 				return false;
 			});
 
+			// Colour Picker
+			$('[data-name="bgColor"], [data-name="color"]').each(function(idx, inputEl) {
+				var	jinputEl = $(this),
+					parentEl = jinputEl.parents('[data-cid]');
+				jinputEl.ColorPicker({
+					color: this.value || '#000',
+					onChange: function(hsb, hex) {
+						jinputEl.val('#' + hex);
+						if (inputEl.getAttribute('data-name') === 'bgColor') parentEl.css('background', '#' + hex);
+						else if (inputEl.getAttribute('data-name') === 'color') parentEl.css('color', '#' + hex);
+						modified(inputEl);
+					}
+				});
+			});
 		});
 	};
 
diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl
index 4c4fe8f394..9b3780c83d 100644
--- a/public/templates/admin/categories.tpl
+++ b/public/templates/admin/categories.tpl
@@ -1,104 +1,101 @@
 
-<h1>Categories</h1>
+<div class="categories">
+	<h1>Categories</h1>
+	<hr />
 
-<hr />
-<ul class="nav nav-pills">
-	<li class='active'><a href='/admin/categories/active'>Active</a></li>
-	<li class=''><a href='/admin/categories/disabled'>Disabled</a></li>
-	<li class=''><a href='/admin/testing/categories'>Unit Tests</a></li>
-</ul>
+	<ul class="nav nav-pills">
+		<li class='active'><a href='/admin/categories/active'>Active</a></li>
+		<li class=''><a href='/admin/categories/disabled'>Disabled</a></li>
+		<li class=''><a href='/admin/testing/categories'>Unit Tests</a></li>
+	</ul>
 
-<!-- TODO: remove inline event listeners. -->
+	<!-- TODO: remove inline event listeners. -->
 
-<div class="row admin-categories">
-	<ul class="col-md-12" id="entry-container">
-	<!-- BEGIN categories -->
-		<li data-cid="{categories.cid}" class="entry-row {categories.blockclass}">
-			<form class="form-inline">
-				<div class="icon">
-					<i data-name="icon" value="{categories.icon}" class="{categories.icon} icon-2x"></i>
-				</div>
-				<input placeholder="Category Name" data-name="name" value="{categories.name}" class="form-control category_name"></input>
-				<select class="form-control blockclass" data-name="blockclass" data-value="{categories.blockclass}">
-					<option value="category-purple">category-purple</option>
-					<option value="category-darkblue">category-darkblue</option>
-					<option value="category-blue">category-blue</option>
-					<option value="category-darkgreen">category-darkgreen</option>
-					<option value="category-orange">category-orange</option>
-				</select>
-				<input data-name="description" placeholder="Category Description" value="{categories.description}" class="form-control category_description description"></input>
-				<input type="hidden" data-name="order" data-value="{categories.order}"></input>
-				<button type="submit" class="btn btn-default disable-btn" data-disabled="{categories.disabled}">Disable</button>
-			</form>
-		</li>
+	<div class="row admin-categories">
+		<ul class="col-md-12" id="entry-container">
+		<!-- BEGIN categories -->
+			<li data-cid="{categories.cid}" class="entry-row" style="background: {categories.bgColor}; color: {categories.color};">
+				<form class="form-inline">
+					<div class="icon">
+						<i data-name="icon" value="{categories.icon}" class="{categories.icon} icon-2x"></i>
+					</div>
+					<input placeholder="Category Name" data-name="name" value="{categories.name}" class="form-control category_name"></input>
+					<input placeholder="#000" data-name="bgColor" value="{categories.bgColor}" class="form-control category_bgColor" />
+					<input placeholder="#000" data-name="color" value="{categories.color}" class="form-control category_color" />
+					<input data-name="description" placeholder="Category Description" value="{categories.description}" class="form-control category_description description"></input>
+					<input type="hidden" data-name="order" data-value="{categories.order}"></input>
+					<button type="submit" class="btn btn-default disable-btn" data-disabled="{categories.disabled}">Disable</button>
+				</form>
+			</li>
 
-	<!-- END categories -->
-	</ul>
+		<!-- END categories -->
+		</ul>
 
-	<button class="btn btn-lg btn-primary" id="save">Save</button>
-	<button class="btn btn-lg btn-primary" id="addNew">Add New</button>
-</div>
+		<button class="btn btn-lg btn-primary" id="save">Save</button>
+		<button class="btn btn-lg btn-primary" id="addNew">Add New</button>
+	</div>
 
-<div id="new-category-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Add New Modal" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h3>Create New Category</h3>
-			</div>
-			<div class="modal-body">
-				<div>
-				<form class='form-horizontal'>
-					<div class="control-group">
-						<label class="control-label" for="inputName">Name</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputName" placeholder="Name" value="">
+	<div id="new-category-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Add New Modal" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h3>Create New Category</h3>
+				</div>
+				<div class="modal-body">
+					<div>
+					<form class='form-horizontal'>
+						<div class="control-group">
+							<label class="control-label" for="inputName">Name</label>
+							<div class="controls">
+								<input class="form-control" type="text" id="inputName" placeholder="Name" value="">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputDescription">Description</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputDescription" placeholder="Description" value="">
+						<div class="control-group">
+							<label class="control-label" for="inputDescription">Description</label>
+							<div class="controls">
+								<input class="form-control" type="text" id="inputDescription" placeholder="Description" value="">
+							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputIcon">Icon</label>
-						<div class="controls">
-							<div class="icon">
-								<i data-name="icon" value="icon-pencil" class="icon-pencil icon-2x"></i>
+						<div class="control-group">
+							<label class="control-label" for="inputIcon">Icon</label>
+							<div class="controls">
+								<div class="icon">
+									<i data-name="icon" value="icon-pencil" class="icon-pencil icon-2x"></i>
+								</div>
 							</div>
 						</div>
-					</div>
 
-					<div class="control-group">
-						<label class="control-label" for="inputBlockclass">Block Class</label>
-						<div class="controls">
-							<select id="inputBlockclass" class="form-control" data-name="blockclass" data-value="">
-								<option value="category-purple">category-purple</option>
-								<option value="category-darkblue">category-darkblue</option>
-								<option value="category-blue">category-blue</option>
-								<option value="category-darkgreen">category-darkgreen</option>
-								<option value="category-orange">category-orange</option>
-							</select>
+						<div class="control-group">
+							<label class="control-label" for="inputBlockclass">Block Class</label>
+							<div class="controls">
+								<select id="inputBlockclass" class="form-control" data-name="blockclass" data-value="">
+									<option value="category-purple">category-purple</option>
+									<option value="category-darkblue">category-darkblue</option>
+									<option value="category-blue">category-blue</option>
+									<option value="category-darkgreen">category-darkgreen</option>
+									<option value="category-orange">category-orange</option>
+								</select>
+							</div>
 						</div>
-					</div>
 
-				</form>
-			</div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" id="create-category-btn" href="#" class="btn btn-primary btn-lg btn-block">Create</button>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
+					</form>
+				</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" id="create-category-btn" href="#" class="btn btn-primary btn-lg btn-block">Create</button>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
 
 
-<div id="icons" style="display:none;"><div class="icon-container"><div class="row fa-icons">
-  <div class="col-md-3"><i class="icon-compass"></i></div><div class="col-md-3"><i class="icon-collapse"></i></div><div class="col-md-3"><i class="icon-collapse-top"></i></div><div class="col-md-3"><i class="icon-expand"></i></div><div class="col-md-3"><i class="icon-eur"></i></div><div class="col-md-3"><i class="icon-euro"></i></div><div class="col-md-3"><i class="icon-gbp"></i></div><div class="col-md-3"><i class="icon-usd"></i></div><div class="col-md-3"><i class="icon-dollar"></i></div><div class="col-md-3"><i class="icon-inr"></i></div><div class="col-md-3"><i class="icon-rupee"></i></div><div class="col-md-3"><i class="icon-jpy"></i></div><div class="col-md-3"><i class="icon-yen"></i></div><div class="col-md-3"><i class="icon-cny"></i></div><div class="col-md-3"><i class="icon-renminbi"></i></div><div class="col-md-3"><i class="icon-krw"></i></div><div class="col-md-3"><i class="icon-won"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-file"></i></div><div class="col-md-3"><i class="icon-file-text"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-order"></i></div><div class="col-md-3"><i class="icon-sort-by-order-alt"></i></div><div class="col-md-3"><i class="icon-thumbs-up"></i></div><div class="col-md-3"><i class="icon-thumbs-down"></i></div><div class="col-md-3"><i class="icon-youtube-sign"></i></div><div class="col-md-3"><i class="icon-youtube"></i></div><div class="col-md-3"><i class="icon-xing"></i></div><div class="col-md-3"><i class="icon-xing-sign"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div><div class="col-md-3"><i class="icon-dropbox"></i></div><div class="col-md-3"><i class="icon-stackexchange"></i></div><div class="col-md-3"><i class="icon-instagram"></i></div><div class="col-md-3"><i class="icon-flickr"></i></div><div class="col-md-3"><i class="icon-adn"></i></div><div class="col-md-3"><i class="icon-bitbucket"></i></div><div class="col-md-3"><i class="icon-bitbucket-sign"></i></div><div class="col-md-3"><i class="icon-tumblr"></i></div><div class="col-md-3"><i class="icon-tumblr-sign"></i></div><div class="col-md-3"><i class="icon-long-arrow-down"></i></div><div class="col-md-3"><i class="icon-long-arrow-up"></i></div><div class="col-md-3"><i class="icon-long-arrow-left"></i></div><div class="col-md-3"><i class="icon-long-arrow-right"></i></div><div class="col-md-3"><i class="icon-apple"></i></div><div class="col-md-3"><i class="icon-windows"></i></div><div class="col-md-3"><i class="icon-android"></i></div><div class="col-md-3"><i class="icon-linux"></i></div><div class="col-md-3"><i class="icon-dribbble"></i></div><div class="col-md-3"><i class="icon-skype"></i></div><div class="col-md-3"><i class="icon-foursquare"></i></div><div class="col-md-3"><i class="icon-trello"></i></div><div class="col-md-3"><i class="icon-female"></i></div><div class="col-md-3"><i class="icon-male"></i></div><div class="col-md-3"><i class="icon-gittip"></i></div><div class="col-md-3"><i class="icon-sun"></i></div><div class="col-md-3"><i class="icon-moon"></i></div><div class="col-md-3"><i class="icon-archive"></i></div><div class="col-md-3"><i class="icon-bug"></i></div><div class="col-md-3"><i class="icon-vk"></i></div><div class="col-md-3"><i class="icon-weibo"></i></div><div class="col-md-3"><i class="icon-renren"></i></div><div class="col-md-3"><i class="icon-adjust"></i></div><div class="col-md-3"><i class="icon-anchor"></i></div><div class="col-md-3"><i class="icon-archive"></i></div><div class="col-md-3"><i class="icon-asterisk"></i></div><div class="col-md-3"><i class="icon-ban-circle"></i></div><div class="col-md-3"><i class="icon-bar-chart"></i></div><div class="col-md-3"><i class="icon-barcode"></i></div><div class="col-md-3"><i class="icon-beaker"></i></div><div class="col-md-3"><i class="icon-beer"></i></div><div class="col-md-3"><i class="icon-bell"></i></div><div class="col-md-3"><i class="icon-bell-alt"></i></div><div class="col-md-3"><i class="icon-bolt"></i></div><div class="col-md-3"><i class="icon-book"></i></div><div class="col-md-3"><i class="icon-bookmark"></i></div><div class="col-md-3"><i class="icon-bookmark-empty"></i></div><div class="col-md-3"><i class="icon-briefcase"></i></div><div class="col-md-3"><i class="icon-bug"></i></div><div class="col-md-3"><i class="icon-building"></i></div><div class="col-md-3"><i class="icon-bullhorn"></i></div><div class="col-md-3"><i class="icon-bullseye"></i></div><div class="col-md-3"><i class="icon-calendar"></i></div><div class="col-md-3"><i class="icon-calendar-empty"></i></div><div class="col-md-3"><i class="icon-camera"></i></div><div class="col-md-3"><i class="icon-camera-retro"></i></div><div class="col-md-3"><i class="icon-certificate"></i></div><div class="col-md-3"><i class="icon-check"></i></div><div class="col-md-3"><i class="icon-check-empty"></i></div><div class="col-md-3"><i class="icon-check-minus"></i></div><div class="col-md-3"><i class="icon-check-sign"></i></div><div class="col-md-3"><i class="icon-circle"></i></div><div class="col-md-3"><i class="icon-circle-blank"></i></div><div class="col-md-3"><i class="icon-cloud"></i></div><div class="col-md-3"><i class="icon-cloud-download"></i></div><div class="col-md-3"><i class="icon-cloud-upload"></i></div><div class="col-md-3"><i class="icon-code"></i></div><div class="col-md-3"><i class="icon-code-fork"></i></div><div class="col-md-3"><i class="icon-coffee"></i></div><div class="col-md-3"><i class="icon-cog"></i></div><div class="col-md-3"><i class="icon-cogs"></i></div><div class="col-md-3"><i class="icon-collapse"></i></div><div class="col-md-3"><i class="icon-collapse-alt"></i></div><div class="col-md-3"><i class="icon-collapse-top"></i></div><div class="col-md-3"><i class="icon-comment"></i></div><div class="col-md-3"><i class="icon-comment-alt"></i></div><div class="col-md-3"><i class="icon-comments"></i></div><div class="col-md-3"><i class="icon-comments-alt"></i></div><div class="col-md-3"><i class="icon-compass"></i></div><div class="col-md-3"><i class="icon-credit-card"></i></div><div class="col-md-3"><i class="icon-crop"></i></div><div class="col-md-3"><i class="icon-dashboard"></i></div><div class="col-md-3"><i class="icon-desktop"></i></div><div class="col-md-3"><i class="icon-download"></i></div><div class="col-md-3"><i class="icon-download-alt"></i></div><div class="col-md-3"><i class="icon-edit"></i></div><div class="col-md-3"><i class="icon-edit-sign"></i></div><div class="col-md-3"><i class="icon-ellipsis-horizontal"></i></div><div class="col-md-3"><i class="icon-ellipsis-vertical"></i></div><div class="col-md-3"><i class="icon-envelope"></i></div><div class="col-md-3"><i class="icon-envelope-alt"></i></div><div class="col-md-3"><i class="icon-eraser"></i></div><div class="col-md-3"><i class="icon-exchange"></i></div><div class="col-md-3"><i class="icon-exclamation"></i></div><div class="col-md-3"><i class="icon-exclamation-sign"></i></div><div class="col-md-3"><i class="icon-expand"></i></div><div class="col-md-3"><i class="icon-expand-alt"></i></div><div class="col-md-3"><i class="icon-external-link"></i></div><div class="col-md-3"><i class="icon-external-link-sign"></i></div><div class="col-md-3"><i class="icon-eye-close"></i></div><div class="col-md-3"><i class="icon-eye-open"></i></div><div class="col-md-3"><i class="icon-facetime-video"></i></div><div class="col-md-3"><i class="icon-female"></i></div><div class="col-md-3"><i class="icon-fighter-jet"></i></div><div class="col-md-3"><i class="icon-film"></i></div><div class="col-md-3"><i class="icon-filter"></i></div><div class="col-md-3"><i class="icon-fire"></i></div><div class="col-md-3"><i class="icon-fire-extinguisher"></i></div><div class="col-md-3"><i class="icon-flag"></i></div><div class="col-md-3"><i class="icon-flag-alt"></i></div><div class="col-md-3"><i class="icon-flag-checkered"></i></div><div class="col-md-3"><i class="icon-folder-close"></i></div><div class="col-md-3"><i class="icon-folder-close-alt"></i></div><div class="col-md-3"><i class="icon-folder-open"></i></div><div class="col-md-3"><i class="icon-folder-open-alt"></i></div><div class="col-md-3"><i class="icon-food"></i></div><div class="col-md-3"><i class="icon-frown"></i></div><div class="col-md-3"><i class="icon-gamepad"></i></div><div class="col-md-3"><i class="icon-gear"></i></div><div class="col-md-3"><i class="icon-gears"></i></div><div class="col-md-3"><i class="icon-gift"></i></div><div class="col-md-3"><i class="icon-glass"></i></div><div class="col-md-3"><i class="icon-globe"></i></div><div class="col-md-3"><i class="icon-group"></i></div><div class="col-md-3"><i class="icon-hdd"></i></div><div class="col-md-3"><i class="icon-headphones"></i></div><div class="col-md-3"><i class="icon-heart"></i></div><div class="col-md-3"><i class="icon-heart-empty"></i></div><div class="col-md-3"><i class="icon-home"></i></div><div class="col-md-3"><i class="icon-inbox"></i></div><div class="col-md-3"><i class="icon-info"></i></div><div class="col-md-3"><i class="icon-info-sign"></i></div><div class="col-md-3"><i class="icon-key"></i></div><div class="col-md-3"><i class="icon-keyboard"></i></div><div class="col-md-3"><i class="icon-laptop"></i></div><div class="col-md-3"><i class="icon-leaf"></i></div><div class="col-md-3"><i class="icon-legal"></i></div><div class="col-md-3"><i class="icon-lemon"></i></div><div class="col-md-3"><i class="icon-level-down"></i></div><div class="col-md-3"><i class="icon-level-up"></i></div><div class="col-md-3"><i class="icon-lightbulb"></i></div><div class="col-md-3"><i class="icon-location-arrow"></i></div><div class="col-md-3"><i class="icon-lock"></i></div><div class="col-md-3"><i class="icon-magic"></i></div><div class="col-md-3"><i class="icon-magnet"></i></div><div class="col-md-3"><i class="icon-mail-forward"></i></div><div class="col-md-3"><i class="icon-mail-reply"></i></div><div class="col-md-3"><i class="icon-mail-reply-all"></i></div><div class="col-md-3"><i class="icon-male"></i></div><div class="col-md-3"><i class="icon-map-marker"></i></div><div class="col-md-3"><i class="icon-meh"></i></div><div class="col-md-3"><i class="icon-microphone"></i></div><div class="col-md-3"><i class="icon-microphone-off"></i></div><div class="col-md-3"><i class="icon-minus"></i></div><div class="col-md-3"><i class="icon-minus-sign"></i></div><div class="col-md-3"><i class="icon-minus-sign-alt"></i></div><div class="col-md-3"><i class="icon-mobile-phone"></i></div><div class="col-md-3"><i class="icon-money"></i></div><div class="col-md-3"><i class="icon-moon"></i></div><div class="col-md-3"><i class="icon-move"></i></div><div class="col-md-3"><i class="icon-music"></i></div><div class="col-md-3"><i class="icon-off"></i></div><div class="col-md-3"><i class="icon-ok"></i></div><div class="col-md-3"><i class="icon-ok-circle"></i></div><div class="col-md-3"><i class="icon-ok-sign"></i></div><div class="col-md-3"><i class="icon-pencil"></i></div><div class="col-md-3"><i class="icon-phone"></i></div><div class="col-md-3"><i class="icon-phone-sign"></i></div><div class="col-md-3"><i class="icon-picture"></i></div><div class="col-md-3"><i class="icon-plane"></i></div><div class="col-md-3"><i class="icon-plus"></i></div><div class="col-md-3"><i class="icon-plus-sign"></i></div><div class="col-md-3"><i class="icon-plus-sign-alt"></i></div><div class="col-md-3"><i class="icon-power-off"></i></div><div class="col-md-3"><i class="icon-print"></i></div><div class="col-md-3"><i class="icon-pushpin"></i></div><div class="col-md-3"><i class="icon-puzzle-piece"></i></div><div class="col-md-3"><i class="icon-qrcode"></i></div><div class="col-md-3"><i class="icon-question"></i></div><div class="col-md-3"><i class="icon-question-sign"></i></div><div class="col-md-3"><i class="icon-quote-left"></i></div><div class="col-md-3"><i class="icon-quote-right"></i></div><div class="col-md-3"><i class="icon-random"></i></div><div class="col-md-3"><i class="icon-refresh"></i></div><div class="col-md-3"><i class="icon-remove"></i></div><div class="col-md-3"><i class="icon-remove-circle"></i></div><div class="col-md-3"><i class="icon-remove-sign"></i></div><div class="col-md-3"><i class="icon-reorder"></i></div><div class="col-md-3"><i class="icon-reply"></i></div><div class="col-md-3"><i class="icon-reply-all"></i></div><div class="col-md-3"><i class="icon-resize-horizontal"></i></div><div class="col-md-3"><i class="icon-resize-vertical"></i></div><div class="col-md-3"><i class="icon-retweet"></i></div><div class="col-md-3"><i class="icon-road"></i></div><div class="col-md-3"><i class="icon-rocket"></i></div><div class="col-md-3"><i class="icon-rss"></i></div><div class="col-md-3"><i class="icon-rss-sign"></i></div><div class="col-md-3"><i class="icon-screenshot"></i></div><div class="col-md-3"><i class="icon-search"></i></div><div class="col-md-3"><i class="icon-share"></i></div><div class="col-md-3"><i class="icon-share-alt"></i></div><div class="col-md-3"><i class="icon-share-sign"></i></div><div class="col-md-3"><i class="icon-shield"></i></div><div class="col-md-3"><i class="icon-shopping-cart"></i></div><div class="col-md-3"><i class="icon-sign-blank"></i></div><div class="col-md-3"><i class="icon-signal"></i></div><div class="col-md-3"><i class="icon-signin"></i></div><div class="col-md-3"><i class="icon-signout"></i></div><div class="col-md-3"><i class="icon-sitemap"></i></div><div class="col-md-3"><i class="icon-smile"></i></div><div class="col-md-3"><i class="icon-sort"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-order"></i></div><div class="col-md-3"><i class="icon-sort-by-order-alt"></i></div><div class="col-md-3"><i class="icon-sort-down"></i></div><div class="col-md-3"><i class="icon-sort-up"></i></div><div class="col-md-3"><i class="icon-spinner"></i></div><div class="col-md-3"><i class="icon-star"></i></div><div class="col-md-3"><i class="icon-star-empty"></i></div><div class="col-md-3"><i class="icon-star-half"></i></div><div class="col-md-3"><i class="icon-star-half-empty"></i></div><div class="col-md-3"><i class="icon-star-half-full"></i></div><div class="col-md-3"><i class="icon-subscript"></i></div><div class="col-md-3"><i class="icon-suitcase"></i></div><div class="col-md-3"><i class="icon-sun"></i></div><div class="col-md-3"><i class="icon-superscript"></i></div><div class="col-md-3"><i class="icon-tablet"></i></div><div class="col-md-3"><i class="icon-tag"></i></div><div class="col-md-3"><i class="icon-tags"></i></div><div class="col-md-3"><i class="icon-tasks"></i></div><div class="col-md-3"><i class="icon-terminal"></i></div><div class="col-md-3"><i class="icon-thumbs-down"></i></div><div class="col-md-3"><i class="icon-thumbs-down-alt"></i></div><div class="col-md-3"><i class="icon-thumbs-up"></i></div><div class="col-md-3"><i class="icon-thumbs-up-alt"></i></div><div class="col-md-3"><i class="icon-ticket"></i></div><div class="col-md-3"><i class="icon-time"></i></div><div class="col-md-3"><i class="icon-tint"></i></div><div class="col-md-3"><i class="icon-trash"></i></div><div class="col-md-3"><i class="icon-trophy"></i></div><div class="col-md-3"><i class="icon-truck"></i></div><div class="col-md-3"><i class="icon-umbrella"></i></div><div class="col-md-3"><i class="icon-unchecked"></i></div><div class="col-md-3"><i class="icon-unlock"></i></div><div class="col-md-3"><i class="icon-unlock-alt"></i></div><div class="col-md-3"><i class="icon-upload"></i></div><div class="col-md-3"><i class="icon-upload-alt"></i></div><div class="col-md-3"><i class="icon-user"></i></div><div class="col-md-3"><i class="icon-volume-down"></i></div><div class="col-md-3"><i class="icon-volume-off"></i></div><div class="col-md-3"><i class="icon-volume-up"></i></div><div class="col-md-3"><i class="icon-warning-sign"></i></div><div class="col-md-3"><i class="icon-wrench"></i></div><div class="col-md-3"><i class="icon-zoom-in"></i></div><div class="col-md-3"><i class="icon-zoom-out"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-cny"></i></div><div class="col-md-3"><i class="icon-dollar"></i></div><div class="col-md-3"><i class="icon-eur"></i></div><div class="col-md-3"><i class="icon-euro"></i></div><div class="col-md-3"><i class="icon-gbp"></i></div><div class="col-md-3"><i class="icon-inr"></i></div><div class="col-md-3"><i class="icon-jpy"></i></div><div class="col-md-3"><i class="icon-krw"></i></div><div class="col-md-3"><i class="icon-renminbi"></i></div><div class="col-md-3"><i class="icon-rupee"></i></div><div class="col-md-3"><i class="icon-usd"></i></div><div class="col-md-3"><i class="icon-won"></i></div><div class="col-md-3"><i class="icon-yen"></i></div>
-  <div class="col-md-3"><i class="icon-align-center"></i></div><div class="col-md-3"><i class="icon-align-justify"></i></div><div class="col-md-3"><i class="icon-align-left"></i></div><div class="col-md-3"><i class="icon-align-right"></i></div><div class="col-md-3"><i class="icon-bold"></i></div><div class="col-md-3"><i class="icon-columns"></i></div><div class="col-md-3"><i class="icon-copy"></i></div><div class="col-md-3"><i class="icon-cut"></i></div><div class="col-md-3"><i class="icon-eraser"></i></div><div class="col-md-3"><i class="icon-file"></i></div><div class="col-md-3"><i class="icon-file-alt"></i></div><div class="col-md-3"><i class="icon-file-text"></i></div><div class="col-md-3"><i class="icon-file-text-alt"></i></div><div class="col-md-3"><i class="icon-font"></i></div><div class="col-md-3"><i class="icon-indent-left"></i></div><div class="col-md-3"><i class="icon-indent-right"></i></div><div class="col-md-3"><i class="icon-italic"></i></div><div class="col-md-3"><i class="icon-link"></i></div><div class="col-md-3"><i class="icon-list"></i></div><div class="col-md-3"><i class="icon-list-alt"></i></div><div class="col-md-3"><i class="icon-list-ol"></i></div><div class="col-md-3"><i class="icon-list-ul"></i></div><div class="col-md-3"><i class="icon-paper-clip"></i></div><div class="col-md-3"><i class="icon-paperclip"></i></div><div class="col-md-3"><i class="icon-paste"></i></div><div class="col-md-3"><i class="icon-repeat"></i></div><div class="col-md-3"><i class="icon-rotate-left"></i></div><div class="col-md-3"><i class="icon-rotate-right"></i></div><div class="col-md-3"><i class="icon-save"></i></div><div class="col-md-3"><i class="icon-strikethrough"></i></div><div class="col-md-3"><i class="icon-table"></i></div><div class="col-md-3"><i class="icon-text-height"></i></div><div class="col-md-3"><i class="icon-text-width"></i></div><div class="col-md-3"><i class="icon-th"></i></div><div class="col-md-3"><i class="icon-th-large"></i></div><div class="col-md-3"><i class="icon-th-list"></i></div><div class="col-md-3"><i class="icon-underline"></i></div><div class="col-md-3"><i class="icon-undo"></i></div><div class="col-md-3"><i class="icon-unlink"></i></div><div class="col-md-3"><i class="icon-angle-down"></i></div><div class="col-md-3"><i class="icon-angle-left"></i></div><div class="col-md-3"><i class="icon-angle-right"></i></div><div class="col-md-3"><i class="icon-angle-up"></i></div><div class="col-md-3"><i class="icon-arrow-down"></i></div><div class="col-md-3"><i class="icon-arrow-left"></i></div><div class="col-md-3"><i class="icon-arrow-right"></i></div><div class="col-md-3"><i class="icon-arrow-up"></i></div><div class="col-md-3"><i class="icon-caret-down"></i></div><div class="col-md-3"><i class="icon-caret-left"></i></div><div class="col-md-3"><i class="icon-caret-right"></i></div><div class="col-md-3"><i class="icon-caret-up"></i></div><div class="col-md-3"><i class="icon-chevron-down"></i></div><div class="col-md-3"><i class="icon-chevron-left"></i></div><div class="col-md-3"><i class="icon-chevron-right"></i></div><div class="col-md-3"><i class="icon-chevron-sign-down"></i></div><div class="col-md-3"><i class="icon-chevron-sign-left"></i></div><div class="col-md-3"><i class="icon-chevron-sign-right"></i></div><div class="col-md-3"><i class="icon-chevron-sign-up"></i></div><div class="col-md-3"><i class="icon-chevron-up"></i></div><div class="col-md-3"><i class="icon-circle-arrow-down"></i></div><div class="col-md-3"><i class="icon-circle-arrow-left"></i></div><div class="col-md-3"><i class="icon-circle-arrow-right"></i></div><div class="col-md-3"><i class="icon-circle-arrow-up"></i></div><div class="col-md-3"><i class="icon-double-angle-down"></i></div><div class="col-md-3"><i class="icon-double-angle-left"></i></div><div class="col-md-3"><i class="icon-double-angle-right"></i></div><div class="col-md-3"><i class="icon-double-angle-up"></i></div><div class="col-md-3"><i class="icon-hand-down"></i></div><div class="col-md-3"><i class="icon-hand-left"></i></div><div class="col-md-3"><i class="icon-hand-right"></i></div><div class="col-md-3"><i class="icon-hand-up"></i></div><div class="col-md-3"><i class="icon-long-arrow-down"></i></div><div class="col-md-3"><i class="icon-long-arrow-left"></i></div><div class="col-md-3"><i class="icon-long-arrow-right"></i></div><div class="col-md-3"><i class="icon-long-arrow-up"></i></div><div class="col-md-3"><i class="icon-backward"></i></div><div class="col-md-3"><i class="icon-eject"></i></div><div class="col-md-3"><i class="icon-fast-backward"></i></div><div class="col-md-3"><i class="icon-fast-forward"></i></div><div class="col-md-3"><i class="icon-forward"></i></div><div class="col-md-3"><i class="icon-fullscreen"></i></div><div class="col-md-3"><i class="icon-pause"></i></div><div class="col-md-3"><i class="icon-play"></i></div><div class="col-md-3"><i class="icon-play-circle"></i></div><div class="col-md-3"><i class="icon-play-sign"></i></div><div class="col-md-3"><i class="icon-resize-full"></i></div><div class="col-md-3"><i class="icon-resize-small"></i></div><div class="col-md-3"><i class="icon-step-backward"></i></div><div class="col-md-3"><i class="icon-step-forward"></i></div><div class="col-md-3"><i class="icon-stop"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div>
-  <div class="col-md-3"><i class="icon-adn"></i></div><div class="col-md-3"><i class="icon-android"></i></div><div class="col-md-3"><i class="icon-apple"></i></div><div class="col-md-3"><i class="icon-bitbucket"></i></div><div class="col-md-3"><i class="icon-bitbucket-sign"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-css3"></i></div><div class="col-md-3"><i class="icon-dribbble"></i></div><div class="col-md-3"><i class="icon-dropbox"></i></div><div class="col-md-3"><i class="icon-facebook"></i></div><div class="col-md-3"><i class="icon-facebook-sign"></i></div><div class="col-md-3"><i class="icon-flickr"></i></div><div class="col-md-3"><i class="icon-foursquare"></i></div><div class="col-md-3"><i class="icon-github"></i></div><div class="col-md-3"><i class="icon-github-alt"></i></div><div class="col-md-3"><i class="icon-github-sign"></i></div><div class="col-md-3"><i class="icon-gittip"></i></div><div class="col-md-3"><i class="icon-google-plus"></i></div><div class="col-md-3"><i class="icon-google-plus-sign"></i></div><div class="col-md-3"><i class="icon-html5"></i></div><div class="col-md-3"><i class="icon-instagram"></i></div><div class="col-md-3"><i class="icon-linkedin"></i></div><div class="col-md-3"><i class="icon-linkedin-sign"></i></div><div class="col-md-3"><i class="icon-linux"></i></div><div class="col-md-3"><i class="icon-maxcdn"></i></div><div class="col-md-3"><i class="icon-pinterest"></i></div><div class="col-md-3"><i class="icon-pinterest-sign"></i></div><div class="col-md-3"><i class="icon-renren"></i></div><div class="col-md-3"><i class="icon-skype"></i></div><div class="col-md-3"><i class="icon-stackexchange"></i></div><div class="col-md-3"><i class="icon-trello"></i></div><div class="col-md-3"><i class="icon-tumblr"></i></div><div class="col-md-3"><i class="icon-tumblr-sign"></i></div><div class="col-md-3"><i class="icon-twitter"></i></div><div class="col-md-3"><i class="icon-twitter-sign"></i></div><div class="col-md-3"><i class="icon-vk"></i></div><div class="col-md-3"><i class="icon-weibo"></i></div><div class="col-md-3"><i class="icon-windows"></i></div><div class="col-md-3"><i class="icon-xing"></i></div><div class="col-md-3"><i class="icon-xing-sign"></i></div><div class="col-md-3"><i class="icon-youtube"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div><div class="col-md-3"><i class="icon-youtube-sign"></i></div>
-  <div class="col-md-3"><i class="icon-ambulance"></i></div><div class="col-md-3"><i class="icon-h-sign"></i></div><div class="col-md-3"><i class="icon-hospital"></i></div><div class="col-md-3"><i class="icon-medkit"></i></div><div class="col-md-3"><i class="icon-plus-sign-alt"></i></div><div class="col-md-3"><i class="icon-stethoscope"></i></div><div class="col-md-3"><i class="icon-user-md"></i></div>
-</div></div></div>
+	<div id="icons" style="display:none;"><div class="icon-container"><div class="row fa-icons">
+	  <div class="col-md-3"><i class="icon-compass"></i></div><div class="col-md-3"><i class="icon-collapse"></i></div><div class="col-md-3"><i class="icon-collapse-top"></i></div><div class="col-md-3"><i class="icon-expand"></i></div><div class="col-md-3"><i class="icon-eur"></i></div><div class="col-md-3"><i class="icon-euro"></i></div><div class="col-md-3"><i class="icon-gbp"></i></div><div class="col-md-3"><i class="icon-usd"></i></div><div class="col-md-3"><i class="icon-dollar"></i></div><div class="col-md-3"><i class="icon-inr"></i></div><div class="col-md-3"><i class="icon-rupee"></i></div><div class="col-md-3"><i class="icon-jpy"></i></div><div class="col-md-3"><i class="icon-yen"></i></div><div class="col-md-3"><i class="icon-cny"></i></div><div class="col-md-3"><i class="icon-renminbi"></i></div><div class="col-md-3"><i class="icon-krw"></i></div><div class="col-md-3"><i class="icon-won"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-file"></i></div><div class="col-md-3"><i class="icon-file-text"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-order"></i></div><div class="col-md-3"><i class="icon-sort-by-order-alt"></i></div><div class="col-md-3"><i class="icon-thumbs-up"></i></div><div class="col-md-3"><i class="icon-thumbs-down"></i></div><div class="col-md-3"><i class="icon-youtube-sign"></i></div><div class="col-md-3"><i class="icon-youtube"></i></div><div class="col-md-3"><i class="icon-xing"></i></div><div class="col-md-3"><i class="icon-xing-sign"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div><div class="col-md-3"><i class="icon-dropbox"></i></div><div class="col-md-3"><i class="icon-stackexchange"></i></div><div class="col-md-3"><i class="icon-instagram"></i></div><div class="col-md-3"><i class="icon-flickr"></i></div><div class="col-md-3"><i class="icon-adn"></i></div><div class="col-md-3"><i class="icon-bitbucket"></i></div><div class="col-md-3"><i class="icon-bitbucket-sign"></i></div><div class="col-md-3"><i class="icon-tumblr"></i></div><div class="col-md-3"><i class="icon-tumblr-sign"></i></div><div class="col-md-3"><i class="icon-long-arrow-down"></i></div><div class="col-md-3"><i class="icon-long-arrow-up"></i></div><div class="col-md-3"><i class="icon-long-arrow-left"></i></div><div class="col-md-3"><i class="icon-long-arrow-right"></i></div><div class="col-md-3"><i class="icon-apple"></i></div><div class="col-md-3"><i class="icon-windows"></i></div><div class="col-md-3"><i class="icon-android"></i></div><div class="col-md-3"><i class="icon-linux"></i></div><div class="col-md-3"><i class="icon-dribbble"></i></div><div class="col-md-3"><i class="icon-skype"></i></div><div class="col-md-3"><i class="icon-foursquare"></i></div><div class="col-md-3"><i class="icon-trello"></i></div><div class="col-md-3"><i class="icon-female"></i></div><div class="col-md-3"><i class="icon-male"></i></div><div class="col-md-3"><i class="icon-gittip"></i></div><div class="col-md-3"><i class="icon-sun"></i></div><div class="col-md-3"><i class="icon-moon"></i></div><div class="col-md-3"><i class="icon-archive"></i></div><div class="col-md-3"><i class="icon-bug"></i></div><div class="col-md-3"><i class="icon-vk"></i></div><div class="col-md-3"><i class="icon-weibo"></i></div><div class="col-md-3"><i class="icon-renren"></i></div><div class="col-md-3"><i class="icon-adjust"></i></div><div class="col-md-3"><i class="icon-anchor"></i></div><div class="col-md-3"><i class="icon-archive"></i></div><div class="col-md-3"><i class="icon-asterisk"></i></div><div class="col-md-3"><i class="icon-ban-circle"></i></div><div class="col-md-3"><i class="icon-bar-chart"></i></div><div class="col-md-3"><i class="icon-barcode"></i></div><div class="col-md-3"><i class="icon-beaker"></i></div><div class="col-md-3"><i class="icon-beer"></i></div><div class="col-md-3"><i class="icon-bell"></i></div><div class="col-md-3"><i class="icon-bell-alt"></i></div><div class="col-md-3"><i class="icon-bolt"></i></div><div class="col-md-3"><i class="icon-book"></i></div><div class="col-md-3"><i class="icon-bookmark"></i></div><div class="col-md-3"><i class="icon-bookmark-empty"></i></div><div class="col-md-3"><i class="icon-briefcase"></i></div><div class="col-md-3"><i class="icon-bug"></i></div><div class="col-md-3"><i class="icon-building"></i></div><div class="col-md-3"><i class="icon-bullhorn"></i></div><div class="col-md-3"><i class="icon-bullseye"></i></div><div class="col-md-3"><i class="icon-calendar"></i></div><div class="col-md-3"><i class="icon-calendar-empty"></i></div><div class="col-md-3"><i class="icon-camera"></i></div><div class="col-md-3"><i class="icon-camera-retro"></i></div><div class="col-md-3"><i class="icon-certificate"></i></div><div class="col-md-3"><i class="icon-check"></i></div><div class="col-md-3"><i class="icon-check-empty"></i></div><div class="col-md-3"><i class="icon-check-minus"></i></div><div class="col-md-3"><i class="icon-check-sign"></i></div><div class="col-md-3"><i class="icon-circle"></i></div><div class="col-md-3"><i class="icon-circle-blank"></i></div><div class="col-md-3"><i class="icon-cloud"></i></div><div class="col-md-3"><i class="icon-cloud-download"></i></div><div class="col-md-3"><i class="icon-cloud-upload"></i></div><div class="col-md-3"><i class="icon-code"></i></div><div class="col-md-3"><i class="icon-code-fork"></i></div><div class="col-md-3"><i class="icon-coffee"></i></div><div class="col-md-3"><i class="icon-cog"></i></div><div class="col-md-3"><i class="icon-cogs"></i></div><div class="col-md-3"><i class="icon-collapse"></i></div><div class="col-md-3"><i class="icon-collapse-alt"></i></div><div class="col-md-3"><i class="icon-collapse-top"></i></div><div class="col-md-3"><i class="icon-comment"></i></div><div class="col-md-3"><i class="icon-comment-alt"></i></div><div class="col-md-3"><i class="icon-comments"></i></div><div class="col-md-3"><i class="icon-comments-alt"></i></div><div class="col-md-3"><i class="icon-compass"></i></div><div class="col-md-3"><i class="icon-credit-card"></i></div><div class="col-md-3"><i class="icon-crop"></i></div><div class="col-md-3"><i class="icon-dashboard"></i></div><div class="col-md-3"><i class="icon-desktop"></i></div><div class="col-md-3"><i class="icon-download"></i></div><div class="col-md-3"><i class="icon-download-alt"></i></div><div class="col-md-3"><i class="icon-edit"></i></div><div class="col-md-3"><i class="icon-edit-sign"></i></div><div class="col-md-3"><i class="icon-ellipsis-horizontal"></i></div><div class="col-md-3"><i class="icon-ellipsis-vertical"></i></div><div class="col-md-3"><i class="icon-envelope"></i></div><div class="col-md-3"><i class="icon-envelope-alt"></i></div><div class="col-md-3"><i class="icon-eraser"></i></div><div class="col-md-3"><i class="icon-exchange"></i></div><div class="col-md-3"><i class="icon-exclamation"></i></div><div class="col-md-3"><i class="icon-exclamation-sign"></i></div><div class="col-md-3"><i class="icon-expand"></i></div><div class="col-md-3"><i class="icon-expand-alt"></i></div><div class="col-md-3"><i class="icon-external-link"></i></div><div class="col-md-3"><i class="icon-external-link-sign"></i></div><div class="col-md-3"><i class="icon-eye-close"></i></div><div class="col-md-3"><i class="icon-eye-open"></i></div><div class="col-md-3"><i class="icon-facetime-video"></i></div><div class="col-md-3"><i class="icon-female"></i></div><div class="col-md-3"><i class="icon-fighter-jet"></i></div><div class="col-md-3"><i class="icon-film"></i></div><div class="col-md-3"><i class="icon-filter"></i></div><div class="col-md-3"><i class="icon-fire"></i></div><div class="col-md-3"><i class="icon-fire-extinguisher"></i></div><div class="col-md-3"><i class="icon-flag"></i></div><div class="col-md-3"><i class="icon-flag-alt"></i></div><div class="col-md-3"><i class="icon-flag-checkered"></i></div><div class="col-md-3"><i class="icon-folder-close"></i></div><div class="col-md-3"><i class="icon-folder-close-alt"></i></div><div class="col-md-3"><i class="icon-folder-open"></i></div><div class="col-md-3"><i class="icon-folder-open-alt"></i></div><div class="col-md-3"><i class="icon-food"></i></div><div class="col-md-3"><i class="icon-frown"></i></div><div class="col-md-3"><i class="icon-gamepad"></i></div><div class="col-md-3"><i class="icon-gear"></i></div><div class="col-md-3"><i class="icon-gears"></i></div><div class="col-md-3"><i class="icon-gift"></i></div><div class="col-md-3"><i class="icon-glass"></i></div><div class="col-md-3"><i class="icon-globe"></i></div><div class="col-md-3"><i class="icon-group"></i></div><div class="col-md-3"><i class="icon-hdd"></i></div><div class="col-md-3"><i class="icon-headphones"></i></div><div class="col-md-3"><i class="icon-heart"></i></div><div class="col-md-3"><i class="icon-heart-empty"></i></div><div class="col-md-3"><i class="icon-home"></i></div><div class="col-md-3"><i class="icon-inbox"></i></div><div class="col-md-3"><i class="icon-info"></i></div><div class="col-md-3"><i class="icon-info-sign"></i></div><div class="col-md-3"><i class="icon-key"></i></div><div class="col-md-3"><i class="icon-keyboard"></i></div><div class="col-md-3"><i class="icon-laptop"></i></div><div class="col-md-3"><i class="icon-leaf"></i></div><div class="col-md-3"><i class="icon-legal"></i></div><div class="col-md-3"><i class="icon-lemon"></i></div><div class="col-md-3"><i class="icon-level-down"></i></div><div class="col-md-3"><i class="icon-level-up"></i></div><div class="col-md-3"><i class="icon-lightbulb"></i></div><div class="col-md-3"><i class="icon-location-arrow"></i></div><div class="col-md-3"><i class="icon-lock"></i></div><div class="col-md-3"><i class="icon-magic"></i></div><div class="col-md-3"><i class="icon-magnet"></i></div><div class="col-md-3"><i class="icon-mail-forward"></i></div><div class="col-md-3"><i class="icon-mail-reply"></i></div><div class="col-md-3"><i class="icon-mail-reply-all"></i></div><div class="col-md-3"><i class="icon-male"></i></div><div class="col-md-3"><i class="icon-map-marker"></i></div><div class="col-md-3"><i class="icon-meh"></i></div><div class="col-md-3"><i class="icon-microphone"></i></div><div class="col-md-3"><i class="icon-microphone-off"></i></div><div class="col-md-3"><i class="icon-minus"></i></div><div class="col-md-3"><i class="icon-minus-sign"></i></div><div class="col-md-3"><i class="icon-minus-sign-alt"></i></div><div class="col-md-3"><i class="icon-mobile-phone"></i></div><div class="col-md-3"><i class="icon-money"></i></div><div class="col-md-3"><i class="icon-moon"></i></div><div class="col-md-3"><i class="icon-move"></i></div><div class="col-md-3"><i class="icon-music"></i></div><div class="col-md-3"><i class="icon-off"></i></div><div class="col-md-3"><i class="icon-ok"></i></div><div class="col-md-3"><i class="icon-ok-circle"></i></div><div class="col-md-3"><i class="icon-ok-sign"></i></div><div class="col-md-3"><i class="icon-pencil"></i></div><div class="col-md-3"><i class="icon-phone"></i></div><div class="col-md-3"><i class="icon-phone-sign"></i></div><div class="col-md-3"><i class="icon-picture"></i></div><div class="col-md-3"><i class="icon-plane"></i></div><div class="col-md-3"><i class="icon-plus"></i></div><div class="col-md-3"><i class="icon-plus-sign"></i></div><div class="col-md-3"><i class="icon-plus-sign-alt"></i></div><div class="col-md-3"><i class="icon-power-off"></i></div><div class="col-md-3"><i class="icon-print"></i></div><div class="col-md-3"><i class="icon-pushpin"></i></div><div class="col-md-3"><i class="icon-puzzle-piece"></i></div><div class="col-md-3"><i class="icon-qrcode"></i></div><div class="col-md-3"><i class="icon-question"></i></div><div class="col-md-3"><i class="icon-question-sign"></i></div><div class="col-md-3"><i class="icon-quote-left"></i></div><div class="col-md-3"><i class="icon-quote-right"></i></div><div class="col-md-3"><i class="icon-random"></i></div><div class="col-md-3"><i class="icon-refresh"></i></div><div class="col-md-3"><i class="icon-remove"></i></div><div class="col-md-3"><i class="icon-remove-circle"></i></div><div class="col-md-3"><i class="icon-remove-sign"></i></div><div class="col-md-3"><i class="icon-reorder"></i></div><div class="col-md-3"><i class="icon-reply"></i></div><div class="col-md-3"><i class="icon-reply-all"></i></div><div class="col-md-3"><i class="icon-resize-horizontal"></i></div><div class="col-md-3"><i class="icon-resize-vertical"></i></div><div class="col-md-3"><i class="icon-retweet"></i></div><div class="col-md-3"><i class="icon-road"></i></div><div class="col-md-3"><i class="icon-rocket"></i></div><div class="col-md-3"><i class="icon-rss"></i></div><div class="col-md-3"><i class="icon-rss-sign"></i></div><div class="col-md-3"><i class="icon-screenshot"></i></div><div class="col-md-3"><i class="icon-search"></i></div><div class="col-md-3"><i class="icon-share"></i></div><div class="col-md-3"><i class="icon-share-alt"></i></div><div class="col-md-3"><i class="icon-share-sign"></i></div><div class="col-md-3"><i class="icon-shield"></i></div><div class="col-md-3"><i class="icon-shopping-cart"></i></div><div class="col-md-3"><i class="icon-sign-blank"></i></div><div class="col-md-3"><i class="icon-signal"></i></div><div class="col-md-3"><i class="icon-signin"></i></div><div class="col-md-3"><i class="icon-signout"></i></div><div class="col-md-3"><i class="icon-sitemap"></i></div><div class="col-md-3"><i class="icon-smile"></i></div><div class="col-md-3"><i class="icon-sort"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet"></i></div><div class="col-md-3"><i class="icon-sort-by-alphabet-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes"></i></div><div class="col-md-3"><i class="icon-sort-by-attributes-alt"></i></div><div class="col-md-3"><i class="icon-sort-by-order"></i></div><div class="col-md-3"><i class="icon-sort-by-order-alt"></i></div><div class="col-md-3"><i class="icon-sort-down"></i></div><div class="col-md-3"><i class="icon-sort-up"></i></div><div class="col-md-3"><i class="icon-spinner"></i></div><div class="col-md-3"><i class="icon-star"></i></div><div class="col-md-3"><i class="icon-star-empty"></i></div><div class="col-md-3"><i class="icon-star-half"></i></div><div class="col-md-3"><i class="icon-star-half-empty"></i></div><div class="col-md-3"><i class="icon-star-half-full"></i></div><div class="col-md-3"><i class="icon-subscript"></i></div><div class="col-md-3"><i class="icon-suitcase"></i></div><div class="col-md-3"><i class="icon-sun"></i></div><div class="col-md-3"><i class="icon-superscript"></i></div><div class="col-md-3"><i class="icon-tablet"></i></div><div class="col-md-3"><i class="icon-tag"></i></div><div class="col-md-3"><i class="icon-tags"></i></div><div class="col-md-3"><i class="icon-tasks"></i></div><div class="col-md-3"><i class="icon-terminal"></i></div><div class="col-md-3"><i class="icon-thumbs-down"></i></div><div class="col-md-3"><i class="icon-thumbs-down-alt"></i></div><div class="col-md-3"><i class="icon-thumbs-up"></i></div><div class="col-md-3"><i class="icon-thumbs-up-alt"></i></div><div class="col-md-3"><i class="icon-ticket"></i></div><div class="col-md-3"><i class="icon-time"></i></div><div class="col-md-3"><i class="icon-tint"></i></div><div class="col-md-3"><i class="icon-trash"></i></div><div class="col-md-3"><i class="icon-trophy"></i></div><div class="col-md-3"><i class="icon-truck"></i></div><div class="col-md-3"><i class="icon-umbrella"></i></div><div class="col-md-3"><i class="icon-unchecked"></i></div><div class="col-md-3"><i class="icon-unlock"></i></div><div class="col-md-3"><i class="icon-unlock-alt"></i></div><div class="col-md-3"><i class="icon-upload"></i></div><div class="col-md-3"><i class="icon-upload-alt"></i></div><div class="col-md-3"><i class="icon-user"></i></div><div class="col-md-3"><i class="icon-volume-down"></i></div><div class="col-md-3"><i class="icon-volume-off"></i></div><div class="col-md-3"><i class="icon-volume-up"></i></div><div class="col-md-3"><i class="icon-warning-sign"></i></div><div class="col-md-3"><i class="icon-wrench"></i></div><div class="col-md-3"><i class="icon-zoom-in"></i></div><div class="col-md-3"><i class="icon-zoom-out"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-cny"></i></div><div class="col-md-3"><i class="icon-dollar"></i></div><div class="col-md-3"><i class="icon-eur"></i></div><div class="col-md-3"><i class="icon-euro"></i></div><div class="col-md-3"><i class="icon-gbp"></i></div><div class="col-md-3"><i class="icon-inr"></i></div><div class="col-md-3"><i class="icon-jpy"></i></div><div class="col-md-3"><i class="icon-krw"></i></div><div class="col-md-3"><i class="icon-renminbi"></i></div><div class="col-md-3"><i class="icon-rupee"></i></div><div class="col-md-3"><i class="icon-usd"></i></div><div class="col-md-3"><i class="icon-won"></i></div><div class="col-md-3"><i class="icon-yen"></i></div>
+	  <div class="col-md-3"><i class="icon-align-center"></i></div><div class="col-md-3"><i class="icon-align-justify"></i></div><div class="col-md-3"><i class="icon-align-left"></i></div><div class="col-md-3"><i class="icon-align-right"></i></div><div class="col-md-3"><i class="icon-bold"></i></div><div class="col-md-3"><i class="icon-columns"></i></div><div class="col-md-3"><i class="icon-copy"></i></div><div class="col-md-3"><i class="icon-cut"></i></div><div class="col-md-3"><i class="icon-eraser"></i></div><div class="col-md-3"><i class="icon-file"></i></div><div class="col-md-3"><i class="icon-file-alt"></i></div><div class="col-md-3"><i class="icon-file-text"></i></div><div class="col-md-3"><i class="icon-file-text-alt"></i></div><div class="col-md-3"><i class="icon-font"></i></div><div class="col-md-3"><i class="icon-indent-left"></i></div><div class="col-md-3"><i class="icon-indent-right"></i></div><div class="col-md-3"><i class="icon-italic"></i></div><div class="col-md-3"><i class="icon-link"></i></div><div class="col-md-3"><i class="icon-list"></i></div><div class="col-md-3"><i class="icon-list-alt"></i></div><div class="col-md-3"><i class="icon-list-ol"></i></div><div class="col-md-3"><i class="icon-list-ul"></i></div><div class="col-md-3"><i class="icon-paper-clip"></i></div><div class="col-md-3"><i class="icon-paperclip"></i></div><div class="col-md-3"><i class="icon-paste"></i></div><div class="col-md-3"><i class="icon-repeat"></i></div><div class="col-md-3"><i class="icon-rotate-left"></i></div><div class="col-md-3"><i class="icon-rotate-right"></i></div><div class="col-md-3"><i class="icon-save"></i></div><div class="col-md-3"><i class="icon-strikethrough"></i></div><div class="col-md-3"><i class="icon-table"></i></div><div class="col-md-3"><i class="icon-text-height"></i></div><div class="col-md-3"><i class="icon-text-width"></i></div><div class="col-md-3"><i class="icon-th"></i></div><div class="col-md-3"><i class="icon-th-large"></i></div><div class="col-md-3"><i class="icon-th-list"></i></div><div class="col-md-3"><i class="icon-underline"></i></div><div class="col-md-3"><i class="icon-undo"></i></div><div class="col-md-3"><i class="icon-unlink"></i></div><div class="col-md-3"><i class="icon-angle-down"></i></div><div class="col-md-3"><i class="icon-angle-left"></i></div><div class="col-md-3"><i class="icon-angle-right"></i></div><div class="col-md-3"><i class="icon-angle-up"></i></div><div class="col-md-3"><i class="icon-arrow-down"></i></div><div class="col-md-3"><i class="icon-arrow-left"></i></div><div class="col-md-3"><i class="icon-arrow-right"></i></div><div class="col-md-3"><i class="icon-arrow-up"></i></div><div class="col-md-3"><i class="icon-caret-down"></i></div><div class="col-md-3"><i class="icon-caret-left"></i></div><div class="col-md-3"><i class="icon-caret-right"></i></div><div class="col-md-3"><i class="icon-caret-up"></i></div><div class="col-md-3"><i class="icon-chevron-down"></i></div><div class="col-md-3"><i class="icon-chevron-left"></i></div><div class="col-md-3"><i class="icon-chevron-right"></i></div><div class="col-md-3"><i class="icon-chevron-sign-down"></i></div><div class="col-md-3"><i class="icon-chevron-sign-left"></i></div><div class="col-md-3"><i class="icon-chevron-sign-right"></i></div><div class="col-md-3"><i class="icon-chevron-sign-up"></i></div><div class="col-md-3"><i class="icon-chevron-up"></i></div><div class="col-md-3"><i class="icon-circle-arrow-down"></i></div><div class="col-md-3"><i class="icon-circle-arrow-left"></i></div><div class="col-md-3"><i class="icon-circle-arrow-right"></i></div><div class="col-md-3"><i class="icon-circle-arrow-up"></i></div><div class="col-md-3"><i class="icon-double-angle-down"></i></div><div class="col-md-3"><i class="icon-double-angle-left"></i></div><div class="col-md-3"><i class="icon-double-angle-right"></i></div><div class="col-md-3"><i class="icon-double-angle-up"></i></div><div class="col-md-3"><i class="icon-hand-down"></i></div><div class="col-md-3"><i class="icon-hand-left"></i></div><div class="col-md-3"><i class="icon-hand-right"></i></div><div class="col-md-3"><i class="icon-hand-up"></i></div><div class="col-md-3"><i class="icon-long-arrow-down"></i></div><div class="col-md-3"><i class="icon-long-arrow-left"></i></div><div class="col-md-3"><i class="icon-long-arrow-right"></i></div><div class="col-md-3"><i class="icon-long-arrow-up"></i></div><div class="col-md-3"><i class="icon-backward"></i></div><div class="col-md-3"><i class="icon-eject"></i></div><div class="col-md-3"><i class="icon-fast-backward"></i></div><div class="col-md-3"><i class="icon-fast-forward"></i></div><div class="col-md-3"><i class="icon-forward"></i></div><div class="col-md-3"><i class="icon-fullscreen"></i></div><div class="col-md-3"><i class="icon-pause"></i></div><div class="col-md-3"><i class="icon-play"></i></div><div class="col-md-3"><i class="icon-play-circle"></i></div><div class="col-md-3"><i class="icon-play-sign"></i></div><div class="col-md-3"><i class="icon-resize-full"></i></div><div class="col-md-3"><i class="icon-resize-small"></i></div><div class="col-md-3"><i class="icon-step-backward"></i></div><div class="col-md-3"><i class="icon-step-forward"></i></div><div class="col-md-3"><i class="icon-stop"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div>
+	  <div class="col-md-3"><i class="icon-adn"></i></div><div class="col-md-3"><i class="icon-android"></i></div><div class="col-md-3"><i class="icon-apple"></i></div><div class="col-md-3"><i class="icon-bitbucket"></i></div><div class="col-md-3"><i class="icon-bitbucket-sign"></i></div><div class="col-md-3"><i class="icon-bitcoin"></i></div><div class="col-md-3"><i class="icon-btc"></i></div><div class="col-md-3"><i class="icon-css3"></i></div><div class="col-md-3"><i class="icon-dribbble"></i></div><div class="col-md-3"><i class="icon-dropbox"></i></div><div class="col-md-3"><i class="icon-facebook"></i></div><div class="col-md-3"><i class="icon-facebook-sign"></i></div><div class="col-md-3"><i class="icon-flickr"></i></div><div class="col-md-3"><i class="icon-foursquare"></i></div><div class="col-md-3"><i class="icon-github"></i></div><div class="col-md-3"><i class="icon-github-alt"></i></div><div class="col-md-3"><i class="icon-github-sign"></i></div><div class="col-md-3"><i class="icon-gittip"></i></div><div class="col-md-3"><i class="icon-google-plus"></i></div><div class="col-md-3"><i class="icon-google-plus-sign"></i></div><div class="col-md-3"><i class="icon-html5"></i></div><div class="col-md-3"><i class="icon-instagram"></i></div><div class="col-md-3"><i class="icon-linkedin"></i></div><div class="col-md-3"><i class="icon-linkedin-sign"></i></div><div class="col-md-3"><i class="icon-linux"></i></div><div class="col-md-3"><i class="icon-maxcdn"></i></div><div class="col-md-3"><i class="icon-pinterest"></i></div><div class="col-md-3"><i class="icon-pinterest-sign"></i></div><div class="col-md-3"><i class="icon-renren"></i></div><div class="col-md-3"><i class="icon-skype"></i></div><div class="col-md-3"><i class="icon-stackexchange"></i></div><div class="col-md-3"><i class="icon-trello"></i></div><div class="col-md-3"><i class="icon-tumblr"></i></div><div class="col-md-3"><i class="icon-tumblr-sign"></i></div><div class="col-md-3"><i class="icon-twitter"></i></div><div class="col-md-3"><i class="icon-twitter-sign"></i></div><div class="col-md-3"><i class="icon-vk"></i></div><div class="col-md-3"><i class="icon-weibo"></i></div><div class="col-md-3"><i class="icon-windows"></i></div><div class="col-md-3"><i class="icon-xing"></i></div><div class="col-md-3"><i class="icon-xing-sign"></i></div><div class="col-md-3"><i class="icon-youtube"></i></div><div class="col-md-3"><i class="icon-youtube-play"></i></div><div class="col-md-3"><i class="icon-youtube-sign"></i></div>
+	  <div class="col-md-3"><i class="icon-ambulance"></i></div><div class="col-md-3"><i class="icon-h-sign"></i></div><div class="col-md-3"><i class="icon-hospital"></i></div><div class="col-md-3"><i class="icon-medkit"></i></div><div class="col-md-3"><i class="icon-plus-sign-alt"></i></div><div class="col-md-3"><i class="icon-stethoscope"></i></div><div class="col-md-3"><i class="icon-user-md"></i></div>
+	</div></div></div>
+</div>
\ No newline at end of file
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index a4dd571c0c..4a64e36270 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="{relative_path}/vendor/bootstrap/js/bootstrap.min.js"></script>
 	<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script>
 	<link rel="stylesheet" type="text/css" href="http://code.jquery.com/qunit/qunit-git.css">
+	<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/colorpicker/colorpicker.css">
 	<script type="text/javascript" src="{relative_path}/socket.io/socket.io.js"></script>
 	<script type="text/javascript" src="{relative_path}/src/app.js"></script>
 	<script type="text/javascript" src="{relative_path}/src/templates.js"></script>
@@ -21,6 +22,7 @@
 	<script src="{relative_path}/vendor/jquery/js/jquery.form.js"></script>
 	<script src="{relative_path}/vendor/requirejs/require.js"></script>
 	<script src="{relative_path}/vendor/bootbox/bootbox.min.js"></script>
+	<script src="{relative_path}/vendor/colorpicker/colorpicker.js"></script>
 
 	<script>
 		require.config({
diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index cc8c5073fa..5d9a532d2c 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -8,7 +8,7 @@
 		<a href="category/{categories.slug}" itemprop="url">
 			<meta itemprop="name" content="{categories.name}">
 			<h4><span class="badge {categories.badgeclass}">{categories.topic_count} </span> {categories.name}</h4>
-			<div class="icon {categories.blockclass}">
+			<div class="icon" style="background: {categories.bgColor}; color: {categories.color};">
 				<div id="category-{categories.cid}" class="category-slider-{categories.post_count}">
 					<div class="category-box"><i class="{categories.icon} icon-4x"></i></div>
 					<div class="category-box" itemprop="description">{categories.description}</div>
diff --git a/public/vendor/colorpicker/colorpicker.css b/public/vendor/colorpicker/colorpicker.css
new file mode 100644
index 0000000000..b5b2158534
--- /dev/null
+++ b/public/vendor/colorpicker/colorpicker.css
@@ -0,0 +1,162 @@
+.colorpicker {
+	width: 356px;
+	height: 176px;
+	overflow: hidden;
+	position: absolute;
+	background: url(./images/custom_background.png);
+	font-family: Arial, Helvetica, sans-serif;
+	display: none;
+}
+.colorpicker_color {
+	width: 150px;
+	height: 150px;
+	left: 14px;
+	top: 13px;
+	position: absolute;
+	background: #f00;
+	overflow: hidden;
+	cursor: crosshair;
+}
+.colorpicker_color div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 150px;
+	height: 150px;
+	background: url(./images/colorpicker_overlay.png);
+}
+.colorpicker_color div div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 11px;
+	height: 11px;
+	overflow: hidden;
+	background: url(./images/colorpicker_select.gif);
+	margin: -5px 0 0 -5px;
+}
+.colorpicker_hue {
+	position: absolute;
+	top: 13px;
+	left: 171px;
+	width: 35px;
+	height: 150px;
+	cursor: n-resize;
+}
+.colorpicker_hue div {
+	position: absolute;
+	width: 35px;
+	height: 9px;
+	overflow: hidden;
+	background: url(./images/custom_indic.gif) left top;
+	margin: -4px 0 0 0;
+	left: 0px;
+}
+.colorpicker_new_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 213px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker_current_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 283px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker input {
+	background-color: transparent;
+	border: 1px solid transparent;
+	position: absolute;
+	font-size: 10px;
+	font-family: Arial, Helvetica, sans-serif;
+	color: #898989;
+	top: 4px;
+	right: 11px;
+	text-align: right;
+	margin: 0;
+	padding: 0;
+	height: 11px;
+}
+.colorpicker_hex {
+	position: absolute;
+	width: 72px;
+	height: 22px;
+	background: url(./images/custom_hex.png) top;
+	left: 212px;
+	top: 142px;
+}
+.colorpicker_hex input {
+	right: 6px;
+}
+.colorpicker_field {
+	height: 22px;
+	width: 62px;
+	background-position: top;
+	position: absolute;
+}
+.colorpicker_field span {
+	position: absolute;
+	width: 12px;
+	height: 22px;
+	overflow: hidden;
+	top: 0;
+	right: 0;
+	cursor: n-resize;
+}
+.colorpicker_rgb_r {
+	background-image: url(./images/custom_rgb_r.png);
+	top: 52px;
+	left: 212px;
+}
+.colorpicker_rgb_g {
+	background-image: url(./images/custom_rgb_g.png);
+	top: 82px;
+	left: 212px;
+}
+.colorpicker_rgb_b {
+	background-image: url(./images/custom_rgb_b.png);
+	top: 112px;
+	left: 212px;
+}
+.colorpicker_hsb_h {
+	background-image: url(./images/custom_hsb_h.png);
+	top: 52px;
+	left: 282px;
+}
+.colorpicker_hsb_s {
+	background-image: url(./images/custom_hsb_s.png);
+	top: 82px;
+	left: 282px;
+}
+.colorpicker_hsb_b {
+	background-image: url(./images/custom_hsb_b.png);
+	top: 112px;
+	left: 282px;
+}
+.colorpicker_submit {
+	display: none;
+	position: absolute;
+	width: 22px;
+	height: 22px;
+	background: url(./images/custom_submit.png) top;
+	left: 322px;
+	top: 142px;
+	overflow: hidden;
+}
+.colorpicker_focus {
+	background-position: center;
+}
+.colorpicker_hex.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_submit.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_slider {
+	background-position: bottom;
+}
\ No newline at end of file
diff --git a/public/vendor/colorpicker/colorpicker.js b/public/vendor/colorpicker/colorpicker.js
new file mode 100644
index 0000000000..2643cb0403
--- /dev/null
+++ b/public/vendor/colorpicker/colorpicker.js
@@ -0,0 +1,484 @@
+/**
+ *
+ * Color picker
+ * Author: Stefan Petre www.eyecon.ro
+ *
+ * Dual licensed under the MIT and GPL licenses
+ *
+ */
+(function ($) {
+	var ColorPicker = function () {
+		var
+			ids = {},
+			inAction,
+			charMin = 65,
+			visible,
+			tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>',
+			defaults = {
+				eventName: 'click',
+				onShow: function () {},
+				onBeforeShow: function(){},
+				onHide: function () {},
+				onChange: function () {},
+				onSubmit: function () {},
+				color: 'ff0000',
+				livePreview: true,
+				flat: false
+			},
+			fillRGBFields = function  (hsb, cal) {
+				var rgb = HSBToRGB(hsb);
+				$(cal).data('colorpicker').fields
+					.eq(1).val(rgb.r).end()
+					.eq(2).val(rgb.g).end()
+					.eq(3).val(rgb.b).end();
+			},
+			fillHSBFields = function  (hsb, cal) {
+				$(cal).data('colorpicker').fields
+					.eq(4).val(hsb.h).end()
+					.eq(5).val(hsb.s).end()
+					.eq(6).val(hsb.b).end();
+			},
+			fillHexFields = function (hsb, cal) {
+				$(cal).data('colorpicker').fields
+					.eq(0).val(HSBToHex(hsb)).end();
+			},
+			setSelector = function (hsb, cal) {
+				$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
+				$(cal).data('colorpicker').selectorIndic.css({
+					left: parseInt(150 * hsb.s/100, 10),
+					top: parseInt(150 * (100-hsb.b)/100, 10)
+				});
+			},
+			setHue = function (hsb, cal) {
+				$(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10));
+			},
+			setCurrentColor = function (hsb, cal) {
+				$(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb));
+			},
+			setNewColor = function (hsb, cal) {
+				$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
+			},
+			keyDown = function (ev) {
+				var pressedKey = ev.charCode || ev.keyCode || -1;
+				if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) {
+					return false;
+				}
+				var cal = $(this).parent().parent();
+				if (cal.data('colorpicker').livePreview === true) {
+					change.apply(this);
+				}
+			},
+			change = function (ev) {
+				var cal = $(this).parent().parent(), col;
+				if (this.parentNode.className.indexOf('_hex') > 0) {
+					cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value));
+				} else if (this.parentNode.className.indexOf('_hsb') > 0) {
+					cal.data('colorpicker').color = col = fixHSB({
+						h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10),
+						s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10),
+						b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10)
+					});
+				} else {
+					cal.data('colorpicker').color = col = RGBToHSB(fixRGB({
+						r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10),
+						g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10),
+						b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10)
+					}));
+				}
+				if (ev) {
+					fillRGBFields(col, cal.get(0));
+					fillHexFields(col, cal.get(0));
+					fillHSBFields(col, cal.get(0));
+				}
+				setSelector(col, cal.get(0));
+				setHue(col, cal.get(0));
+				setNewColor(col, cal.get(0));
+				cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]);
+			},
+			blur = function (ev) {
+				var cal = $(this).parent().parent();
+				cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus');
+			},
+			focus = function () {
+				charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65;
+				$(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus');
+				$(this).parent().addClass('colorpicker_focus');
+			},
+			downIncrement = function (ev) {
+				var field = $(this).parent().find('input').focus();
+				var current = {
+					el: $(this).parent().addClass('colorpicker_slider'),
+					max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
+					y: ev.pageY,
+					field: field,
+					val: parseInt(field.val(), 10),
+					preview: $(this).parent().parent().data('colorpicker').livePreview
+				};
+				$(document).bind('mouseup', current, upIncrement);
+				$(document).bind('mousemove', current, moveIncrement);
+			},
+			moveIncrement = function (ev) {
+				ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10))));
+				if (ev.data.preview) {
+					change.apply(ev.data.field.get(0), [true]);
+				}
+				return false;
+			},
+			upIncrement = function (ev) {
+				change.apply(ev.data.field.get(0), [true]);
+				ev.data.el.removeClass('colorpicker_slider').find('input').focus();
+				$(document).unbind('mouseup', upIncrement);
+				$(document).unbind('mousemove', moveIncrement);
+				return false;
+			},
+			downHue = function (ev) {
+				var current = {
+					cal: $(this).parent(),
+					y: $(this).offset().top
+				};
+				current.preview = current.cal.data('colorpicker').livePreview;
+				$(document).bind('mouseup', current, upHue);
+				$(document).bind('mousemove', current, moveHue);
+			},
+			moveHue = function (ev) {
+				change.apply(
+					ev.data.cal.data('colorpicker')
+						.fields
+						.eq(4)
+						.val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10))
+						.get(0),
+					[ev.data.preview]
+				);
+				return false;
+			},
+			upHue = function (ev) {
+				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
+				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
+				$(document).unbind('mouseup', upHue);
+				$(document).unbind('mousemove', moveHue);
+				return false;
+			},
+			downSelector = function (ev) {
+				var current = {
+					cal: $(this).parent(),
+					pos: $(this).offset()
+				};
+				current.preview = current.cal.data('colorpicker').livePreview;
+				$(document).bind('mouseup', current, upSelector);
+				$(document).bind('mousemove', current, moveSelector);
+			},
+			moveSelector = function (ev) {
+				change.apply(
+					ev.data.cal.data('colorpicker')
+						.fields
+						.eq(6)
+						.val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10))
+						.end()
+						.eq(5)
+						.val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10))
+						.get(0),
+					[ev.data.preview]
+				);
+				return false;
+			},
+			upSelector = function (ev) {
+				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
+				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
+				$(document).unbind('mouseup', upSelector);
+				$(document).unbind('mousemove', moveSelector);
+				return false;
+			},
+			enterSubmit = function (ev) {
+				$(this).addClass('colorpicker_focus');
+			},
+			leaveSubmit = function (ev) {
+				$(this).removeClass('colorpicker_focus');
+			},
+			clickSubmit = function (ev) {
+				var cal = $(this).parent();
+				var col = cal.data('colorpicker').color;
+				cal.data('colorpicker').origColor = col;
+				setCurrentColor(col, cal.get(0));
+				cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
+			},
+			show = function (ev) {
+				var cal = $('#' + $(this).data('colorpickerId'));
+				cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
+				var pos = $(this).offset();
+				var viewPort = getViewport();
+				var top = pos.top + this.offsetHeight;
+				var left = pos.left;
+				if (top + 176 > viewPort.t + viewPort.h) {
+					top -= this.offsetHeight + 176;
+				}
+				if (left + 356 > viewPort.l + viewPort.w) {
+					left -= 356;
+				}
+				cal.css({left: left + 'px', top: top + 'px'});
+				if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
+					cal.show();
+				}
+				$(document).bind('mousedown', {cal: cal}, hide);
+				return false;
+			},
+			hide = function (ev) {
+				if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
+					if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
+						ev.data.cal.hide();
+					}
+					$(document).unbind('mousedown', hide);
+				}
+			},
+			isChildOf = function(parentEl, el, container) {
+				if (parentEl == el) {
+					return true;
+				}
+				if (parentEl.contains) {
+					return parentEl.contains(el);
+				}
+				if ( parentEl.compareDocumentPosition ) {
+					return !!(parentEl.compareDocumentPosition(el) & 16);
+				}
+				var prEl = el.parentNode;
+				while(prEl && prEl != container) {
+					if (prEl == parentEl)
+						return true;
+					prEl = prEl.parentNode;
+				}
+				return false;
+			},
+			getViewport = function () {
+				var m = document.compatMode == 'CSS1Compat';
+				return {
+					l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
+					t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
+					w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
+					h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
+				};
+			},
+			fixHSB = function (hsb) {
+				return {
+					h: Math.min(360, Math.max(0, hsb.h)),
+					s: Math.min(100, Math.max(0, hsb.s)),
+					b: Math.min(100, Math.max(0, hsb.b))
+				};
+			},
+			fixRGB = function (rgb) {
+				return {
+					r: Math.min(255, Math.max(0, rgb.r)),
+					g: Math.min(255, Math.max(0, rgb.g)),
+					b: Math.min(255, Math.max(0, rgb.b))
+				};
+			},
+			fixHex = function (hex) {
+				var len = 6 - hex.length;
+				if (len > 0) {
+					var o = [];
+					for (var i=0; i<len; i++) {
+						o.push('0');
+					}
+					o.push(hex);
+					hex = o.join('');
+				}
+				return hex;
+			},
+			HexToRGB = function (hex) {
+				var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
+				return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
+			},
+			HexToHSB = function (hex) {
+				return RGBToHSB(HexToRGB(hex));
+			},
+			RGBToHSB = function (rgb) {
+				var hsb = {
+					h: 0,
+					s: 0,
+					b: 0
+				};
+				var min = Math.min(rgb.r, rgb.g, rgb.b);
+				var max = Math.max(rgb.r, rgb.g, rgb.b);
+				var delta = max - min;
+				hsb.b = max;
+				if (max != 0) {
+
+				}
+				hsb.s = max != 0 ? 255 * delta / max : 0;
+				if (hsb.s != 0) {
+					if (rgb.r == max) {
+						hsb.h = (rgb.g - rgb.b) / delta;
+					} else if (rgb.g == max) {
+						hsb.h = 2 + (rgb.b - rgb.r) / delta;
+					} else {
+						hsb.h = 4 + (rgb.r - rgb.g) / delta;
+					}
+				} else {
+					hsb.h = -1;
+				}
+				hsb.h *= 60;
+				if (hsb.h < 0) {
+					hsb.h += 360;
+				}
+				hsb.s *= 100/255;
+				hsb.b *= 100/255;
+				return hsb;
+			},
+			HSBToRGB = function (hsb) {
+				var rgb = {};
+				var h = Math.round(hsb.h);
+				var s = Math.round(hsb.s*255/100);
+				var v = Math.round(hsb.b*255/100);
+				if(s == 0) {
+					rgb.r = rgb.g = rgb.b = v;
+				} else {
+					var t1 = v;
+					var t2 = (255-s)*v/255;
+					var t3 = (t1-t2)*(h%60)/60;
+					if(h==360) h = 0;
+					if(h<60) {rgb.r=t1;	rgb.b=t2; rgb.g=t2+t3}
+					else if(h<120) {rgb.g=t1; rgb.b=t2;	rgb.r=t1-t3}
+					else if(h<180) {rgb.g=t1; rgb.r=t2;	rgb.b=t2+t3}
+					else if(h<240) {rgb.b=t1; rgb.r=t2;	rgb.g=t1-t3}
+					else if(h<300) {rgb.b=t1; rgb.g=t2;	rgb.r=t2+t3}
+					else if(h<360) {rgb.r=t1; rgb.g=t2;	rgb.b=t1-t3}
+					else {rgb.r=0; rgb.g=0;	rgb.b=0}
+				}
+				return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
+			},
+			RGBToHex = function (rgb) {
+				var hex = [
+					rgb.r.toString(16),
+					rgb.g.toString(16),
+					rgb.b.toString(16)
+				];
+				$.each(hex, function (nr, val) {
+					if (val.length == 1) {
+						hex[nr] = '0' + val;
+					}
+				});
+				return hex.join('');
+			},
+			HSBToHex = function (hsb) {
+				return RGBToHex(HSBToRGB(hsb));
+			},
+			restoreOriginal = function () {
+				var cal = $(this).parent();
+				var col = cal.data('colorpicker').origColor;
+				cal.data('colorpicker').color = col;
+				fillRGBFields(col, cal.get(0));
+				fillHexFields(col, cal.get(0));
+				fillHSBFields(col, cal.get(0));
+				setSelector(col, cal.get(0));
+				setHue(col, cal.get(0));
+				setNewColor(col, cal.get(0));
+			};
+		return {
+			init: function (opt) {
+				opt = $.extend({}, defaults, opt||{});
+				if (typeof opt.color == 'string') {
+					opt.color = HexToHSB(opt.color);
+				} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
+					opt.color = RGBToHSB(opt.color);
+				} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
+					opt.color = fixHSB(opt.color);
+				} else {
+					return this;
+				}
+				return this.each(function () {
+					if (!$(this).data('colorpickerId')) {
+						var options = $.extend({}, opt);
+						options.origColor = opt.color;
+						var id = 'collorpicker_' + parseInt(Math.random() * 1000);
+						$(this).data('colorpickerId', id);
+						var cal = $(tpl).attr('id', id);
+						if (options.flat) {
+							cal.appendTo(this).show();
+						} else {
+							cal.appendTo(document.body);
+						}
+						options.fields = cal
+											.find('input')
+												.bind('keyup', keyDown)
+												.bind('change', change)
+												.bind('blur', blur)
+												.bind('focus', focus);
+						cal
+							.find('span').bind('mousedown', downIncrement).end()
+							.find('>div.colorpicker_current_color').bind('click', restoreOriginal);
+						options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector);
+						options.selectorIndic = options.selector.find('div div');
+						options.el = this;
+						options.hue = cal.find('div.colorpicker_hue div');
+						cal.find('div.colorpicker_hue').bind('mousedown', downHue);
+						options.newColor = cal.find('div.colorpicker_new_color');
+						options.currentColor = cal.find('div.colorpicker_current_color');
+						cal.data('colorpicker', options);
+						cal.find('div.colorpicker_submit')
+							.bind('mouseenter', enterSubmit)
+							.bind('mouseleave', leaveSubmit)
+							.bind('click', clickSubmit);
+						fillRGBFields(options.color, cal.get(0));
+						fillHSBFields(options.color, cal.get(0));
+						fillHexFields(options.color, cal.get(0));
+						setHue(options.color, cal.get(0));
+						setSelector(options.color, cal.get(0));
+						setCurrentColor(options.color, cal.get(0));
+						setNewColor(options.color, cal.get(0));
+						if (options.flat) {
+							cal.css({
+								position: 'relative',
+								display: 'block'
+							});
+						} else {
+							$(this).bind(options.eventName, show);
+						}
+					}
+				});
+			},
+			showPicker: function() {
+				return this.each( function () {
+					if ($(this).data('colorpickerId')) {
+						show.apply(this);
+					}
+				});
+			},
+			hidePicker: function() {
+				return this.each( function () {
+					if ($(this).data('colorpickerId')) {
+						$('#' + $(this).data('colorpickerId')).hide();
+					}
+				});
+			},
+			setColor: function(col) {
+				if (typeof col == 'string') {
+					col = HexToHSB(col);
+				} else if (col.r != undefined && col.g != undefined && col.b != undefined) {
+					col = RGBToHSB(col);
+				} else if (col.h != undefined && col.s != undefined && col.b != undefined) {
+					col = fixHSB(col);
+				} else {
+					return this;
+				}
+				return this.each(function(){
+					if ($(this).data('colorpickerId')) {
+						var cal = $('#' + $(this).data('colorpickerId'));
+						cal.data('colorpicker').color = col;
+						cal.data('colorpicker').origColor = col;
+						fillRGBFields(col, cal.get(0));
+						fillHSBFields(col, cal.get(0));
+						fillHexFields(col, cal.get(0));
+						setHue(col, cal.get(0));
+						setSelector(col, cal.get(0));
+						setCurrentColor(col, cal.get(0));
+						setNewColor(col, cal.get(0));
+					}
+				});
+			}
+		};
+	}();
+	$.fn.extend({
+		ColorPicker: ColorPicker.init,
+		ColorPickerHide: ColorPicker.hidePicker,
+		ColorPickerShow: ColorPicker.showPicker,
+		ColorPickerSetColor: ColorPicker.setColor
+	});
+})(jQuery)
\ No newline at end of file
diff --git a/public/vendor/colorpicker/images/Thumbs.db b/public/vendor/colorpicker/images/Thumbs.db
new file mode 100644
index 0000000000..d396c36dd8
Binary files /dev/null and b/public/vendor/colorpicker/images/Thumbs.db differ
diff --git a/public/vendor/colorpicker/images/blank.gif b/public/vendor/colorpicker/images/blank.gif
new file mode 100644
index 0000000000..75b945d255
Binary files /dev/null and b/public/vendor/colorpicker/images/blank.gif differ
diff --git a/public/vendor/colorpicker/images/colorpicker_background.png b/public/vendor/colorpicker/images/colorpicker_background.png
new file mode 100644
index 0000000000..8401572f19
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_background.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_hex.png b/public/vendor/colorpicker/images/colorpicker_hex.png
new file mode 100644
index 0000000000..4e532d7c65
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_hex.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_hsb_b.png b/public/vendor/colorpicker/images/colorpicker_hsb_b.png
new file mode 100644
index 0000000000..dfac595d01
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_hsb_b.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_hsb_h.png b/public/vendor/colorpicker/images/colorpicker_hsb_h.png
new file mode 100644
index 0000000000..3977ed9f21
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_hsb_h.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_hsb_s.png b/public/vendor/colorpicker/images/colorpicker_hsb_s.png
new file mode 100644
index 0000000000..a2a699736c
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_hsb_s.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_indic.gif b/public/vendor/colorpicker/images/colorpicker_indic.gif
new file mode 100644
index 0000000000..f9fa95e282
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_indic.gif differ
diff --git a/public/vendor/colorpicker/images/colorpicker_overlay.png b/public/vendor/colorpicker/images/colorpicker_overlay.png
new file mode 100644
index 0000000000..561cdd9c59
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_overlay.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_rgb_b.png b/public/vendor/colorpicker/images/colorpicker_rgb_b.png
new file mode 100644
index 0000000000..dfac595d01
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_rgb_b.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_rgb_g.png b/public/vendor/colorpicker/images/colorpicker_rgb_g.png
new file mode 100644
index 0000000000..72b32760a5
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_rgb_g.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_rgb_r.png b/public/vendor/colorpicker/images/colorpicker_rgb_r.png
new file mode 100644
index 0000000000..4855fe03f8
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_rgb_r.png differ
diff --git a/public/vendor/colorpicker/images/colorpicker_select.gif b/public/vendor/colorpicker/images/colorpicker_select.gif
new file mode 100644
index 0000000000..599f7f13a6
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_select.gif differ
diff --git a/public/vendor/colorpicker/images/colorpicker_submit.png b/public/vendor/colorpicker/images/colorpicker_submit.png
new file mode 100644
index 0000000000..7f4c0825f5
Binary files /dev/null and b/public/vendor/colorpicker/images/colorpicker_submit.png differ
diff --git a/public/vendor/colorpicker/images/custom_background.png b/public/vendor/colorpicker/images/custom_background.png
new file mode 100644
index 0000000000..cf55ffdd68
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_background.png differ
diff --git a/public/vendor/colorpicker/images/custom_hex.png b/public/vendor/colorpicker/images/custom_hex.png
new file mode 100644
index 0000000000..888f444495
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_hex.png differ
diff --git a/public/vendor/colorpicker/images/custom_hsb_b.png b/public/vendor/colorpicker/images/custom_hsb_b.png
new file mode 100644
index 0000000000..2f99dae8e6
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_hsb_b.png differ
diff --git a/public/vendor/colorpicker/images/custom_hsb_h.png b/public/vendor/colorpicker/images/custom_hsb_h.png
new file mode 100644
index 0000000000..a217e9218e
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_hsb_h.png differ
diff --git a/public/vendor/colorpicker/images/custom_hsb_s.png b/public/vendor/colorpicker/images/custom_hsb_s.png
new file mode 100644
index 0000000000..7826b41507
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_hsb_s.png differ
diff --git a/public/vendor/colorpicker/images/custom_indic.gif b/public/vendor/colorpicker/images/custom_indic.gif
new file mode 100644
index 0000000000..222fb94cfd
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_indic.gif differ
diff --git a/public/vendor/colorpicker/images/custom_rgb_b.png b/public/vendor/colorpicker/images/custom_rgb_b.png
new file mode 100644
index 0000000000..80764e5d6d
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_rgb_b.png differ
diff --git a/public/vendor/colorpicker/images/custom_rgb_g.png b/public/vendor/colorpicker/images/custom_rgb_g.png
new file mode 100644
index 0000000000..fc9778be1e
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_rgb_g.png differ
diff --git a/public/vendor/colorpicker/images/custom_rgb_r.png b/public/vendor/colorpicker/images/custom_rgb_r.png
new file mode 100644
index 0000000000..91b0cd4c52
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_rgb_r.png differ
diff --git a/public/vendor/colorpicker/images/custom_submit.png b/public/vendor/colorpicker/images/custom_submit.png
new file mode 100644
index 0000000000..cd202cd93b
Binary files /dev/null and b/public/vendor/colorpicker/images/custom_submit.png differ
diff --git a/public/vendor/colorpicker/images/select.png b/public/vendor/colorpicker/images/select.png
new file mode 100644
index 0000000000..21213bfd51
Binary files /dev/null and b/public/vendor/colorpicker/images/select.png differ
diff --git a/public/vendor/colorpicker/images/select2.png b/public/vendor/colorpicker/images/select2.png
new file mode 100644
index 0000000000..2cd2cabeb6
Binary files /dev/null and b/public/vendor/colorpicker/images/select2.png differ
diff --git a/public/vendor/colorpicker/images/slider.png b/public/vendor/colorpicker/images/slider.png
new file mode 100644
index 0000000000..8b03da96eb
Binary files /dev/null and b/public/vendor/colorpicker/images/slider.png differ
diff --git a/src/upgrade.js b/src/upgrade.js
index 47d9fffc98..e4d64de4ca 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -9,7 +9,7 @@ var RDB = require('./redis.js'),
 	schemaDate, thisSchemaDate;
 
 Upgrade.check = function(callback) {
-	var	latestSchema = new Date(2013, 10, 11).getTime();
+	var	latestSchema = new Date(2013, 10, 22).getTime();
 
 	RDB.get('schemaDate', function(err, value) {
 		if (parseInt(value, 10) >= latestSchema) {
@@ -128,6 +128,52 @@ Upgrade.upgrade = function(callback) {
 				winston.info('[2013/11/11] Update to postDelay skipped.');
 				next();
 			}
+		},
+		function(next) {
+			thisSchemaDate = new Date(2013, 10, 22).getTime();
+			if (schemaDate < thisSchemaDate) {
+				RDB.keys('category:*', function(err, categories) {
+					async.each(categories, function(categoryStr, next) {
+						var	hex;
+						RDB.hgetall(categoryStr, function(err, categoryObj) {
+							switch(categoryObj.blockclass) {
+								case 'category-purple':
+									hex = '#ab1290';
+									break;
+
+								case 'category-darkblue':
+									hex = '#004c66';
+									break;
+
+								case 'category-blue':
+									hex = '#0059b2';
+									break;
+
+								case 'category-darkgreen':
+									hex = '#004000';
+									break;
+
+								case 'category-orange':
+									hex = '#ff7a4d';
+									break;
+
+								default:
+									hex = '#0059b2';
+									break;
+							}
+
+							RDB.hset(categoryStr, 'bgColor', hex, next);
+							RDB.hdel(categoryStr, 'blockclass');
+						});
+					}, function() {
+						winston.info('[2013/11/22] Updated Category colours.');
+						next();
+					});
+				});
+			} else {
+				winston.info('[2013/11/22] Update to Category colours skipped.');
+				next();
+			}
 		}
 		// Add new schema updates here
 		// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 12!!!