Index: Dev/branches/rest-dojo-ui/client/config/config.bat
===================================================================
--- Dev/branches/rest-dojo-ui/client/config/config.bat	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/config/config.bat	(revision 411)
@@ -0,0 +1,1 @@
+node ../dojo/dojo.js load=config/db
Index: Dev/branches/rest-dojo-ui/client/index.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/index.html	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/index.html	(revision 411)
@@ -2,14 +2,14 @@
 <html>
     <head>
-        <title>Research Facilitator Tool</title>
+        <title>QED</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
     </head>
-    <body class="dijitReset claro">
+    <body class="dijitReset claro" id="rft">
         <script type="text/javascript" src="dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, isDebug: true"></script>
         <script type="text/javascript" src="rft/run.js"></script>
         <div id="content" class="page" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="region:'center'" style="width: 100%; height: 100%;">
             <div class="topbar" data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
-                <a href="#!/"><h1>ResearchTool</h1></a>
+                <a href="#!/"><h1>QED</h1></a>
                 <div data-dojo-type="rft/ui/MainMenu"></div>
             </div>
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors.less	(revision 411)
@@ -20,5 +20,5 @@
 
 		.hoverColorMixin (@color) {
-			&.bgColorHover:hover {
+			&.hoverBgColor:hover {
 				background-color: @@color !important;
 				&.light {
@@ -27,5 +27,5 @@
 				}
 			}
-			.bgColorHover:hover {
+			.hoverBgColor:hover {
 				background-color: @@color;
 				&.light {
@@ -37,5 +37,5 @@
 
 		.hoverTextColorMixin (@color) {
-			&.textColorHover:hover {
+			&.hoverTextColor:hover {
 				color: @@color !important;
 				&.light {
@@ -44,5 +44,5 @@
 				}
 			}
-			.textColorHover:hover {
+			.hoverTextColor:hover {
 				color: @@color;
 				&.light {
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors2.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors2.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/colors2.less	(revision 411)
@@ -16,18 +16,40 @@
 
 // Variables/Colour scheme parameters
-@blue: #0000ff;
-@blue_light: #7777ff;
-@red: #ff0000;
-@red_light: #ff7777;
-@green: #00ff00;
-@green_light: #77ff77;
-@orange: #ff7700;
-@orange_light: #ffaa77;
-@purple: #ff00ff;
-@purple_light: #ffaaff;
-@text: #ffffff;
-@black: #000000;
+.textColor (@color) {
+	color: @@color;
+}
+.textColorH (@color) {
+	color: @@color;
+	&.doesHover:hover {
+		@colorName: "@{color}_light";
+		color: @@colorName;
+	}
+}
+.hoverTextColor (@color) {
+	&:hover {
+		color: @@color;
 
-.colorMixin (@color) {
+	}
+}
+.bgColor (@color) {
+	background-color: @@color;
+}
+.bgColorH (@color) {
+	background-color: @@color;
+	&.doesHover:hover {
+		@colorName: "@{color}_light";
+		background-color: @@colorName;
+	}
+}
+.hoverBgColor (@color) {
+	&:hover {
+		background-color: @@color;
+
+	}
+}
+
+
+// Private color mixin is used to assign the colour classes below, don't use this in external CSS!
+.privateColorMixin (@color) {
 	&.textColor {	//Change text colour to C-Class
 		color: @@color;
@@ -43,5 +65,5 @@
 			@colorName: "@{color}_light";
 			background-color: @@colorName;
-			color: @black;
+			color: @darkest;
 		}
 	}
@@ -58,17 +80,17 @@
 
 		.blue {
-			.colorMixin("blue");
+			.privateColorMixin("blue");
 		}
 		.red {
-			.colorMixin("red");
+			.privateColorMixin("red");
 		}
 		.orange {
-			.colorMixin("orange");
+			.privateColorMixin("orange");
 		}
 		.green {
-			.colorMixin("green");
+			.privateColorMixin("green");
 		}
 		.purple {
-			.colorMixin("purple");
+			.privateColorMixin("purple");
 		}
 
@@ -81,5 +103,4 @@
 			transition: background-color 0.2s;
 		}
-
 	}
 }
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/layout.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/layout.css	(revision 410)
+++ 	(revision )
@@ -1,9 +1,0 @@
-*:focus {
-  outline: none;
-}
-html,
-body {
-  width: 100%;
-  height: 100%;
-  background-color: 5px;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/layout.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/layout.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/layout.less	(revision 411)
@@ -14,4 +14,10 @@
 		font-size: @font_size;
 		color: @darkest;
+
+		.dijitBorderContainer, .dijitContentPane, .dijitTabContainer, .dijitTabPaneWrapper {
+			background: transparent;
+			border: none;
+		}		
+
 
 		h1 {
@@ -164,20 +170,7 @@
 			overflow: hidden;
 
-			&.dijitTabHover {
-				.transition (0.1s);
-				color: @text;
-				border-color: @text;
-			}
-
-			&.dijitTabActive {
-				.transition (0.1s);
-				color: @headers;
-			}
-
-			&.dijitTabChecked {
-				.transition (0.1s);
-				color: @text;
-				border: 1px solid transparent;
-			}
+			
+
+			
 		}
 
@@ -187,5 +180,5 @@
 
 			.dijitTab {
-				margin: @std_offset 0;
+				margin: @std_offset;
 				width: 200px;
 				min-height: @tab_height;
@@ -197,5 +190,27 @@
 					width: 190px;
 				}
-			}
+
+				&.dijitTabChecked {
+					.transition (0.1s);
+					color: @text;
+					border: 1px solid transparent;
+
+					&.dijitTabHover {
+						border: 1px solid transparent;
+					}
+				}
+
+				&.dijitTabHover {
+					.transition (0.1s);
+					color: @text;
+					border-color: @text;
+				}
+
+				&.dijitTabActive {
+					.transition (0.1s);
+					color: @headers;
+				}
+			}
+
 		}
 		//Tab colour settings
@@ -203,25 +218,25 @@
 		.blue .dijitTabChecked,
 		div.blue.dijitTabChecked {
-			background-color: @blue;
+			.bgColor ("blue");
 		}
 		&.green .dijitTabChecked,
 		.green .dijitTabChecked,
 		div.green.dijitTabChecked {
-			background-color: @green;
+			.bgColor ("green");
 		}
 		&.red .dijitTabChecked,
 		.red .dijitTabChecked,
 		div.red.dijitTabChecked {
-			background-color: @red;
+			.bgColor ("red");
 		}
 		&.orange .dijitTabChecked,
 		.orange .dijitTabChecked,
 		div.orange.dijitTabChecked {
-			background-color: @orange;
+			.bgColor ("orange");
 		}
 		&.purple .dijitTabChecked,
 		.purple .dijitTabChecked,
 		div.purple.dijitTabChecked {
-			background-color: @purple;
+			.bgColor ("purple");
 		}
 
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.css	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.css	(revision 411)
@@ -1,2 +1,233 @@
+/* Menu.css */
+@import "external.css";
+DESCRIPTION {
+  /*
+How to use colour system:
+Apply a combination of at most 1 "colour" class and one or more "modifier" classes.
+Colour classes: Red, Blue, Green, Orange, Purple
+Modifer classes:
+- textColor: Change the font colour of element to the "colour" class combined with.
+- bgColor: Change the background colour to the "colour" class combined with.
+- doesHover: If present in combination with one of the above two modifiers, 
+the element will shift it's background- or text colour to a lighter version on hover.
+- hoverTextColor: Same as .textColor, but only affects elements being hovered over.
+- hoverBgColor: Same as .bgColor, but only affects elements being hovered over.
+NOTE: .doesHover does nothing in combination with the above two modifiers!
+*/
+
+}
+#rft.claro .blue.textColor {
+  color: #0072bc;
+}
+#rft.claro .blue.textColor.doesHover:hover {
+  color: #0794d1;
+}
+#rft.claro .blue.bgColor {
+  background-color: #0072bc;
+  color: #ffffff;
+}
+#rft.claro .blue.bgColor.doesHover:hover {
+  background-color: #0794d1;
+  color: #111111;
+}
+#rft.claro .blue.hoverTextColor:hover {
+  color: #0072bc;
+}
+#rft.claro .blue.hoverBgColor:hover {
+  background-color: #0072bc;
+}
+#rft.claro .red.textColor {
+  color: #8c0310;
+}
+#rft.claro .red.textColor.doesHover:hover {
+  color: #bd0013;
+}
+#rft.claro .red.bgColor {
+  background-color: #8c0310;
+  color: #ffffff;
+}
+#rft.claro .red.bgColor.doesHover:hover {
+  background-color: #bd0013;
+  color: #111111;
+}
+#rft.claro .red.hoverTextColor:hover {
+  color: #8c0310;
+}
+#rft.claro .red.hoverBgColor:hover {
+  background-color: #8c0310;
+}
+#rft.claro .orange.textColor {
+  color: #ff5b12;
+}
+#rft.claro .orange.textColor.doesHover:hover {
+  color: #ff9140;
+}
+#rft.claro .orange.bgColor {
+  background-color: #ff5b12;
+  color: #ffffff;
+}
+#rft.claro .orange.bgColor.doesHover:hover {
+  background-color: #ff9140;
+  color: #111111;
+}
+#rft.claro .orange.hoverTextColor:hover {
+  color: #ff5b12;
+}
+#rft.claro .orange.hoverBgColor:hover {
+  background-color: #ff5b12;
+}
+#rft.claro .green.textColor {
+  color: #3aa605;
+}
+#rft.claro .green.textColor.doesHover:hover {
+  color: #79ca0a;
+}
+#rft.claro .green.bgColor {
+  background-color: #3aa605;
+  color: #ffffff;
+}
+#rft.claro .green.bgColor.doesHover:hover {
+  background-color: #79ca0a;
+  color: #111111;
+}
+#rft.claro .green.hoverTextColor:hover {
+  color: #3aa605;
+}
+#rft.claro .green.hoverBgColor:hover {
+  background-color: #3aa605;
+}
+#rft.claro .purple.textColor {
+  color: #6529b7;
+}
+#rft.claro .purple.textColor.doesHover:hover {
+  color: #993dec;
+}
+#rft.claro .purple.bgColor {
+  background-color: #6529b7;
+  color: #ffffff;
+}
+#rft.claro .purple.bgColor.doesHover:hover {
+  background-color: #993dec;
+  color: #111111;
+}
+#rft.claro .purple.hoverTextColor:hover {
+  color: #6529b7;
+}
+#rft.claro .purple.hoverBgColor:hover {
+  background-color: #6529b7;
+}
+#rft.claro .textColor,
+#rft.claro .hoverTextColor {
+  transition: color 0.2s;
+}
+#rft.claro .bgColor,
+#rft.claro .hoverBgColor {
+  transition: background-color 0.2s;
+}
+/* This stylesheet compensates for the restoration of the claro style to its original specs. (21-6-2012)
+ * These changes should be moved to relevant stylesheets as soon as possible!
+*/
+/* Menu.css */
+.claro .topbar .dijitMenuitem {
+  width: 90px;
+  background-image: none;
+  background-position: top;
+  text-align: center;
+}
+.claro .dijitMenuPassive .dijitMenuItemHover,
+.claro .dijitMenuPassive .dijitMenuItemSelected {
+  background-color: transparent;
+  color: #ffffff;
+  border: none;
+  padding: 0 4px;
+}
+.claro .dijitMenuPassive .dijitMenuItemActive {
+  background-position: top;
+}
+/* layout/BorderContainer.css */
+.claro .dijitSplitContainer-child,
+.claro .dijitBorderContainer-child {
+  border: none;
+}
+.claro .dijitTabContainerTop-dijitContentPane,
+.claro .dijitTabContainerLeft-dijitContentPane,
+.claro .dijitTabContainerBottom-dijitContentPane,
+.claro .dijitTabContainerRight-dijitContentPane,
+.claro .dijitAccordionContainer-dijitContentPane {
+  background-color: transparent;
+}
+.claro .dijitSplitContainer-dijitContentPane,
+.claro .dijitBorderContainer-dijitContentPane {
+  background-color: transparent;
+}
+/* layout/TabContainer.css */
+.claro .dijitTabPaneWrapper {
+  background: transparent;
+}
+.claro .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #999999;
+  border: none;
+}
+.claro .dijitTabContent {
+  border: none;
+}
+.claro .dijitTabHover .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabInnerDiv {
+  color: #0072bc;
+}
+.claro .dijitTabChecked .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #ffffff;
+}
+.claro .dijitTabContent {
+  border: 1px solid #999999;
+}
+.claro .dijitTabHover .dijitTabContent {
+  border-color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabContent {
+  border-color: transparent;
+}
+.claro .dijitTabChecked .dijitTabContent {
+  color: #ffffff;
+  border-color: #0072bc;
+}
+/*lefttabs*/
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+  border-width: 1px;
+  left: 0;
+  margin-bottom: 4px;
+  margin-right: 8px;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv {
+  border: none;
+  background: transparent;
+  background-image: none;
+  background-position: top;
+  background-repeat: no-repeat;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+  padding: 3px 8px 4px 8px;
+  background-image: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabContent {
+  padding-right: 8px;
+  background-image: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv,
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+  -moz-border-radius: 0;
+  border-radius: 0;
+  border: none;
+}
 *:focus {
   outline: none;
@@ -13,6 +244,13 @@
   color: #111111;
 }
+#rft.claro .dijitBorderContainer,
+#rft.claro .dijitContentPane,
+#rft.claro .dijitTabContainer,
+#rft.claro .dijitTabPaneWrapper {
+  background: transparent;
+  border: none;
+}
 #rft.claro h1 {
-  margin: 0;
+  margin: 0 0 0 0;
   padding: 0 10px 8px 10px;
   float: left;
@@ -28,6 +266,6 @@
 }
 #rft.claro h2 {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   color: #999999;
   font-size: 22px;
@@ -38,9 +276,10 @@
   height: 32px;
   margin: 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons32.png');
   margin-right: 8px;
 }
 #rft.claro h3 {
-  margin: 0;
+  margin: 0 0 0 0;
   font-size: 18px;
   margin-bottom: 4px;
@@ -77,10 +316,10 @@
 }
 #rft.claro .dijitContentPane.page {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
 }
 #rft.claro .dijitContentPane.content {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   display: block;
   clear: both;
@@ -134,5 +373,20 @@
   overflow: hidden;
 }
-#rft.claro .dijitTab.dijitTabHover {
+#rft.claro .dijitTabContainerLeft-tabs {
+  border: none;
+  padding: 4px;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab {
+  margin: 4px;
+  width: 200px;
+  min-height: 30px;
+  border: 1px solid #999999;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab .dijitTabContent {
+  min-height: 30px;
+  line-height: 30px;
+  width: 190px;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabChecked {
   -webkit-transition: all 0.1s;
   -moz-transition: all 0.1s;
@@ -141,7 +395,19 @@
   transition: all 0.1s;
   color: #ffffff;
+  border: 1px solid transparent;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabChecked.dijitTabHover {
+  border: 1px solid transparent;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabHover {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+  color: #ffffff;
   border-color: #ffffff;
 }
-#rft.claro .dijitTab.dijitTabActive {
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabActive {
   -webkit-transition: all 0.1s;
   -moz-transition: all 0.1s;
@@ -151,28 +417,4 @@
   color: #999999;
 }
-#rft.claro .dijitTab.dijitTabChecked {
-  -webkit-transition: all 0.1s;
-  -moz-transition: all 0.1s;
-  -o-transition: all 0.1s;
-  -ms-transition: all 0.1s;
-  transition: all 0.1s;
-  color: #ffffff;
-  border: 1px solid transparent;
-}
-#rft.claro .dijitTabContainerLeft-tabs {
-  border: none;
-  padding: 4px;
-}
-#rft.claro .dijitTabContainerLeft-tabs .dijitTab {
-  margin: 4px 0;
-  width: 200px;
-  min-height: 30px;
-  border: 1px solid #999999;
-}
-#rft.claro .dijitTabContainerLeft-tabs .dijitTab .dijitTabContent {
-  min-height: 30px;
-  line-height: 30px;
-  width: 190px;
-}
 #rft.claro.blue .dijitTabChecked,
 #rft.claro .blue .dijitTabChecked,
@@ -220,5 +462,5 @@
 #rft.claro .floatRight {
   float: right;
-  margin: 0;
+  margin: 0 0 0 0;
 }
 #rft.claro .rftLineListView {
@@ -230,174 +472,7 @@
   overflow: auto;
 }
-#rft.claro .bgColor {
-  -webkit-transition-property: background-color 0.2s;
-  -moz-transition-property: background-color 0.2s;
-  -o-transition-property: background-color 0.2s;
-  -ms-transition-property: background-color 0.2s;
-  transition-property: background-color 0.2s;
-}
-#rft.claro .blue.bgColor,
-#rft.claro.blue.bgColor {
-  background-color: #0072bc !important;
-}
-#rft.claro .blue.bgColor.light,
-#rft.claro.blue.bgColor.light {
-  background-color: #0794d1 !important;
-}
-#rft.claro .blue .bgColor,
-#rft.claro.blue .bgColor {
-  background-color: #0072bc;
-}
-#rft.claro .blue .bgColor.light,
-#rft.claro.blue .bgColor.light {
-  background-color: #0794d1;
-}
-#rft.claro .blue.bgColorHover:hover,
-#rft.claro.blue.bgColorHover:hover {
-  background-color: #0072bc !important;
-}
-#rft.claro .blue.bgColorHover:hover.light,
-#rft.claro.blue.bgColorHover:hover.light {
-  background-color: #0794d1 !important;
-}
-#rft.claro .blue .bgColorHover:hover,
-#rft.claro.blue .bgColorHover:hover {
-  background-color: #0072bc;
-}
-#rft.claro .blue .bgColorHover:hover.light,
-#rft.claro.blue .bgColorHover:hover.light {
-  background-color: #0794d1;
-}
-#rft.claro .green.bgColor,
-#rft.claro.green.bgColor {
-  background-color: #3aa605 !important;
-}
-#rft.claro .green.bgColor.light,
-#rft.claro.green.bgColor.light {
-  background-color: #79ca0a !important;
-}
-#rft.claro .green .bgColor,
-#rft.claro.green .bgColor {
-  background-color: #3aa605;
-}
-#rft.claro .green .bgColor.light,
-#rft.claro.green .bgColor.light {
-  background-color: #79ca0a;
-}
-#rft.claro .green.bgColorHover:hover,
-#rft.claro.green.bgColorHover:hover {
-  background-color: #3aa605 !important;
-}
-#rft.claro .green.bgColorHover:hover.light,
-#rft.claro.green.bgColorHover:hover.light {
-  background-color: #79ca0a !important;
-}
-#rft.claro .green .bgColorHover:hover,
-#rft.claro.green .bgColorHover:hover {
-  background-color: #3aa605;
-}
-#rft.claro .green .bgColorHover:hover.light,
-#rft.claro.green .bgColorHover:hover.light {
-  background-color: #79ca0a;
-}
-#rft.claro .orange.bgColor,
-#rft.claro.orange.bgColor {
-  background-color: #ff5b12 !important;
-}
-#rft.claro .orange.bgColor.light,
-#rft.claro.orange.bgColor.light {
-  background-color: #ff9140 !important;
-}
-#rft.claro .orange .bgColor,
-#rft.claro.orange .bgColor {
-  background-color: #ff5b12;
-}
-#rft.claro .orange .bgColor.light,
-#rft.claro.orange .bgColor.light {
-  background-color: #ff9140;
-}
-#rft.claro .orange.bgColorHover:hover,
-#rft.claro.orange.bgColorHover:hover {
-  background-color: #ff5b12 !important;
-}
-#rft.claro .orange.bgColorHover:hover.light,
-#rft.claro.orange.bgColorHover:hover.light {
-  background-color: #ff9140 !important;
-}
-#rft.claro .orange .bgColorHover:hover,
-#rft.claro.orange .bgColorHover:hover {
-  background-color: #ff5b12;
-}
-#rft.claro .orange .bgColorHover:hover.light,
-#rft.claro.orange .bgColorHover:hover.light {
-  background-color: #ff9140;
-}
-#rft.claro .red.bgColor,
-#rft.claro.red.bgColor {
-  background-color: #8c0310 !important;
-}
-#rft.claro .red.bgColor.light,
-#rft.claro.red.bgColor.light {
-  background-color: #bd0013 !important;
-}
-#rft.claro .red .bgColor,
-#rft.claro.red .bgColor {
-  background-color: #8c0310;
-}
-#rft.claro .red .bgColor.light,
-#rft.claro.red .bgColor.light {
-  background-color: #bd0013;
-}
-#rft.claro .red.bgColorHover:hover,
-#rft.claro.red.bgColorHover:hover {
-  background-color: #8c0310 !important;
-}
-#rft.claro .red.bgColorHover:hover.light,
-#rft.claro.red.bgColorHover:hover.light {
-  background-color: #bd0013 !important;
-}
-#rft.claro .red .bgColorHover:hover,
-#rft.claro.red .bgColorHover:hover {
-  background-color: #8c0310;
-}
-#rft.claro .red .bgColorHover:hover.light,
-#rft.claro.red .bgColorHover:hover.light {
-  background-color: #bd0013;
-}
-#rft.claro .purple.bgColor,
-#rft.claro.purple.bgColor {
-  background-color: #6529b7 !important;
-}
-#rft.claro .purple.bgColor.light,
-#rft.claro.purple.bgColor.light {
-  background-color: #993dec !important;
-}
-#rft.claro .purple .bgColor,
-#rft.claro.purple .bgColor {
-  background-color: #6529b7;
-}
-#rft.claro .purple .bgColor.light,
-#rft.claro.purple .bgColor.light {
-  background-color: #993dec;
-}
-#rft.claro .purple.bgColorHover:hover,
-#rft.claro.purple.bgColorHover:hover {
-  background-color: #6529b7 !important;
-}
-#rft.claro .purple.bgColorHover:hover.light,
-#rft.claro.purple.bgColorHover:hover.light {
-  background-color: #993dec !important;
-}
-#rft.claro .purple .bgColorHover:hover,
-#rft.claro.purple .bgColorHover:hover {
-  background-color: #6529b7;
-}
-#rft.claro .purple .bgColorHover:hover.light,
-#rft.claro.purple .bgColorHover:hover.light {
-  background-color: #993dec;
-}
 #rft.claro .rftIcon {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   float: left;
   display: inline-block;
@@ -406,22 +481,4 @@
   background-repeat: no-repeat;
 }
-#rft.claro .rftIcon.rftMainIcon {
-  width: 32px;
-  height: 32px;
-  margin: 0;
-  background-image: url('images/icons/rftIcons32.png');
-}
-#rft.claro .rftIcon.rftMidIcon {
-  width: 24px;
-  height: 24px;
-  margin: 0px 0;
-  background-image: url('images/icons/rftIcons16.png');
-}
-#rft.claro .rftIcon.rftSmallIcon {
-  width: 16px;
-  height: 16px;
-  margin: 4px 0;
-  background-image: url('images/icons/rftIcons16.png');
-}
 #rft .rftIconApplication {
   background-position: 0px 0px;
@@ -577,35 +634,36 @@
   background-position: -1920px 0px;
 }
-#rft .claro .rftSelector {
-  margin: 0;
-  padding: 0;
+#rft.claro .rftSelector {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   margin: 4px;
 }
-#rft .claro .rftSelector .rftLineWithButtons {
-  margin: 0;
-  padding: 0;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor {
-  margin: 0;
-  padding: 0;
+#rft.claro .rftSelector .rftLineWithActions {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   float: left;
   width: 8px;
   height: 24px;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.conflict {
+  background-color: #bedead;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.conflict {
   background-color: #ff0000;
 }
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.pending {
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.pending {
   background-color: #ff8000;
 }
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.success {
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.success {
   background-color: #00ff00;
 }
-#rft .claro .rftSelector .rftSelectorOptions .rftLineWithButtons,
-#rft .claro .rftSelector .rftSelectorSelected .rftLineWithButtons {
+#rft.claro .rftSelector .rftSelectorOptions .rftLineWithActions,
+#rft.claro .rftSelector .rftSelectorSelected .rftLineWithActions {
   background-color: #ffffff;
   color: #111111;
 }
-#rft.claro .rftLineWithButtons {
+#rft.claro .rftLineWithActions {
   border: none;
   background-image: none;
@@ -617,6 +675,7 @@
   white-space: nowrap;
   margin: 4px 0;
-}
-#rft.claro .rftLineWithButtons.dojoDndItem {
+  color: #ffffff;
+}
+#rft.claro .rftLineWithActions.dojoDndItem {
   -webkit-transition: all 0.2s;
   -moz-transition: all 0.2s;
@@ -625,23 +684,20 @@
   transition: all 0.2s;
 }
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemBefore {
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemBefore {
   margin-top: 6px;
   border-top: 6px solid #ffffff;
 }
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemAfter {
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemAfter {
   margin-bottom: 6px;
   border-bottom: 6px solid #ffffff;
 }
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemover,
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemAnchor {
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemover,
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemAnchor {
   background-image: none;
   border: none;
   padding: 2px;
-}
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemover *,
-#rft.claro .rftLineWithButtons.dojoDndItem.dojoDndItemAnchor * {
   background-color: rgba(255, 255, 255, 0.1);
 }
-#rft.claro .rftLineWithButtons .rftLineWithButtonsTitle {
+#rft.claro .rftLineWithActions .rftLineWithActionsTitle {
   float: left;
   margin: 0 8px;
@@ -650,7 +706,7 @@
   word-wrap: break-word;
 }
-#rft.claro .rftLineWithButtons .rftLineWithButtonsButtons {
-  margin: 0;
-  padding: 0;
+#rft.claro .rftLineWithActions .rftLineWithActionsButtons {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   line-height: 24px;
   height: 24px;
@@ -659,5 +715,5 @@
   float: left;
 }
-#rft.claro .dojoDndSourceMoved .rftLineWithButtons.dojoDndItemAnchor {
+#rft.claro .dojoDndSourceMoved .rftLineWithActions.dojoDndItemAnchor {
   height: 0;
 }
@@ -692,4 +748,5 @@
   height: 32px;
   margin: 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons32.png');
   float: left;
@@ -702,6 +759,6 @@
   box-shadow: none;
   border-radius: 0;
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
@@ -728,4 +785,5 @@
   height: 32px;
   margin: 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons32.png');
   margin: 0 8px;
@@ -733,4 +791,5 @@
 #rft.claro .rftIndexMenuButton.oneHeight {
   height: 100px;
+  width: 400px;
 }
 #rft.claro .rftIndexMenuButton.oneHeight .dijitButtonNode {
@@ -739,4 +798,5 @@
 #rft.claro .rftIndexMenuButton.twoHeight {
   height: 200px;
+  width: 400px;
 }
 #rft.claro .rftIndexMenuButton.twoHeight .dijitButtonNode {
@@ -745,4 +805,5 @@
 #rft.claro .rftIndexMenuButton.fourHeight {
   height: 400px;
+  width: 400px;
 }
 #rft.claro .rftIndexMenuButton.fourHeight .dijitButtonNode {
@@ -781,8 +842,4 @@
 }
 #rft.claro .rftIndexMenuButton.rftIndexMenuButtonActive {
-  width: 32px;
-  height: 32px;
-  margin: 0;
-  background-image: url('images/icons/rftIcons32b.png');
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
@@ -793,4 +850,11 @@
   background: #ffffff;
 }
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonActive .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32b.png');
+}
 #rft.claro .dijitMenuPopup .dijitMenu {
   border: none;
@@ -800,4 +864,5 @@
   border-radius: 0;
   color: #999999;
+  background-color: #333333;
   border: none;
 }
@@ -809,5 +874,5 @@
   box-shadow: none;
   border-radius: 0;
-  background-color: transparent;
+  background-color: #333333;
 }
 #rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover .dijitMenuItemLabel,
@@ -815,4 +880,29 @@
 #rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected .dijitMenuItemLabel {
   color: #ffffff;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.red,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.red,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.red {
+  background-color: #8c0310;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.blue,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.blue,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.blue {
+  background-color: #0072bc;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.green,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.green,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.green {
+  background-color: #3aa605;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.orange,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.orange,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.orange {
+  background-color: #ff5b12;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.purple,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.purple,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.purple {
+  background-color: #6529b7;
 }
 #rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem .rftIcon {
@@ -820,6 +910,7 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16.png');
-  margin: 0;
+  margin: 0 0 0 0;
   margin-right: 8px;
 }
@@ -828,4 +919,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16b.png');
 }
@@ -873,5 +965,5 @@
 }
 #rft.claro .dojoxTitleGroup .dijitTitlePane {
-  margin: 0;
+  margin: 0 0 0 0;
 }
 #rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitle {
@@ -881,5 +973,5 @@
   box-shadow: none;
   border-radius: 0;
-  margin: 0;
+  margin: 0 0 0 0;
   background-color: #ff5b12;
   border: none;
@@ -901,5 +993,5 @@
 }
 #rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitleFocus {
-  margin: 0;
+  margin: 0 0 0 0;
 }
 #rft.claro .rftSurveyListView .rftSurveyListViewContent {
@@ -944,10 +1036,11 @@
   width: 24px;
   height: 24px;
-  margin: 0px 0;
-  background-image: url('images/icons/rftIcons16.png');
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons24.png');
 }
 #rft.claro .rftLargeButton .dijitButtonNode .dijitButtonText {
   line-height: 24px;
-  margin: 0;
+  margin: 0 0 0 0;
   padding-left: 8px;
 }
@@ -955,6 +1048,7 @@
   width: 24px;
   height: 24px;
-  margin: 0px 0;
-  background-image: url('images/icons/rftIcons16b.png');
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons24b.png');
 }
 #rft.claro .rftLargeButton.rftLargeButtonHover .dijitButtonNode,
@@ -992,7 +1086,8 @@
   box-shadow: none;
   border-radius: 0;
-  margin: 0;
+  margin: 0 0 0 0;
   height: 24px;
   line-height: 24px;
+  vertical-align: top;
 }
 #rft.claro .rftBlockButton .dijitButtonNode {
@@ -1007,4 +1102,6 @@
   -ms-transition: all 0.3s;
   transition: all 0.3s;
+  line-height: 24px;
+  vertical-align: top;
   height: 24px;
   padding: 0 4px;
@@ -1014,7 +1111,8 @@
 }
 #rft.claro .rftBlockButton .dijitButtonNode .rftIcon {
-  width: 24px;
-  height: 24px;
-  margin: 0px 0;
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16.png');
 }
@@ -1029,83 +1127,10 @@
 #rft.claro .rftBlockButton.rftBlockButtonHover .rftIcon,
 #rft.claro .rftBlockButton.rftBlockButtonActive .rftIcon {
-  width: 24px;
-  height: 24px;
-  margin: 0px 0;
+  vertical-align: top;
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16b.png');
-}
-#rft.claro .blue.rftBlockButtonHover .dijitButtonNode {
-  background-color: #0072bc;
-}
-#rft.claro .blue.rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #0794d1;
-}
-#rft.claro .blue .rftBlockButtonHover .dijitButtonNode {
-  background-color: #0072bc;
-}
-#rft.claro .blue .rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #0794d1;
-}
-#rft.claro .blue.light .rftBlockButtonHover .dijitButtonNode {
-  background-color: #0794d1;
-}
-#rft.claro .green.rftBlockButtonHover .dijitButtonNode {
-  background-color: #3aa605;
-}
-#rft.claro .green.rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #79ca0a;
-}
-#rft.claro .green .rftBlockButtonHover .dijitButtonNode {
-  background-color: #3aa605;
-}
-#rft.claro .green .rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #79ca0a;
-}
-#rft.claro .green.light .rftBlockButtonHover .dijitButtonNode {
-  background-color: #79ca0a;
-}
-#rft.claro .orange.rftBlockButtonHover .dijitButtonNode {
-  background-color: #ff5b12;
-}
-#rft.claro .orange.rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #ff9140;
-}
-#rft.claro .orange .rftBlockButtonHover .dijitButtonNode {
-  background-color: #ff5b12;
-}
-#rft.claro .orange .rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #ff9140;
-}
-#rft.claro .orange.light .rftBlockButtonHover .dijitButtonNode {
-  background-color: #ff9140;
-}
-#rft.claro .red.rftBlockButtonHover .dijitButtonNode {
-  background-color: #8c0310;
-}
-#rft.claro .red.rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #bd0013;
-}
-#rft.claro .red .rftBlockButtonHover .dijitButtonNode {
-  background-color: #8c0310;
-}
-#rft.claro .red .rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #bd0013;
-}
-#rft.claro .red.light .rftBlockButtonHover .dijitButtonNode {
-  background-color: #bd0013;
-}
-#rft.claro .purple.rftBlockButtonHover .dijitButtonNode {
-  background-color: #6529b7;
-}
-#rft.claro .purple.rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #993dec;
-}
-#rft.claro .purple .rftBlockButtonHover .dijitButtonNode {
-  background-color: #6529b7;
-}
-#rft.claro .purple .rftBlockButtonHover.light .dijitButtonNode {
-  background-color: #993dec;
-}
-#rft.claro .purple.light .rftBlockButtonHover .dijitButtonNode {
-  background-color: #993dec;
 }
 #rft.claro .rftInlineButton {
@@ -1115,6 +1140,6 @@
 }
 #rft.claro .rftInlineButton .dijitButtonNode {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   border: none;
   background-image: none;
@@ -1130,4 +1155,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16.png');
 }
@@ -1136,4 +1162,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16.png');
 }
@@ -1142,4 +1169,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16b.png');
 }
@@ -1148,4 +1176,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16b.png');
 }
@@ -1154,4 +1183,5 @@
   height: 16px;
   margin: 4px 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons16b.png');
 }
@@ -1163,15 +1193,16 @@
   height: 32px;
   margin: 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons32.png');
   float: left;
   margin: 20px 8px;
 }
-#rft.claro .rftObjectBox .rftLineWithButtons {
-  margin: 0;
-  padding: 0;
+#rft.claro .rftObjectBox .rftLineWithActions {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
 }
 #rft.claro .rftSessionObject {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   width: 100px;
   height: 100px;
@@ -1184,10 +1215,11 @@
   height: 32px;
   margin: 0;
+  padding: 0 0 0 0;
   background-image: url('images/icons/rftIcons32.png');
   margin: 8px 34px 0 34px;
 }
 #rft.claro .rftSessionObject label {
-  margin: 0;
-  padding: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
   float: left;
   clear: both;
@@ -1215,2 +1247,35 @@
   background-color: #bd0013;
 }
+#rft.claro .rftObjectBox {
+  padding: 0 0 0 0;
+  color: #ffffff;
+}
+#rft.claro .rftObjectBox .typeIcon.rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+}
+#rft.claro .rftObjectBox .rftLineWithActions {
+  background-color: #3aa605;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorCategory .rftLineWithActions {
+  background-color: #ff5b12;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftLineWithActions {
+  background-color: #ffffff;
+  color: #111111;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton {
+  background-color: #ff00ff;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton .dijitButtonNode {
+  background-color: #ff5b12;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton.dijitHover .dijitButtonNode {
+  background-color: #ffffff;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton.dijitActive .dijitButtonNode {
+  background-color: #ff9140;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/main.less	(revision 411)
@@ -1,6 +1,13 @@
+// Setup up compilation context and shared functionality
 @import "variables.less";
 @import "mixins.less";
+@import "colors2.less";
+
+// Link to dijit/claro/dojox css
+@import "external.css";
+@import "claroOverride.less";
+
+// RFT specific styling
 @import "layout.less";
-@import "colors.less";
 @import "rftIcons.less";
 @import "rftSelector.less";
@@ -12,2 +19,6 @@
 @import "rftObjectBox.less";
 @import "sessionEditor.less";
+@import "sessions.less";
+
+// Page specific stylesheets!
+@import "pages/questions.less";
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/menus.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/menus.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/menus.less	(revision 411)
@@ -3,18 +3,18 @@
 		//Index menu
 		.rftIndexMenuBlock {
-			width: @im_blockwidth;
-			height: @im_blockheight;
+			width: @indexmenu_blockwidth;
+			height: @indexmenu_blockheight;
 			background: @base1;
 			float: left;
-			margin: @im_blockmargin;
+			margin: @indexmenu_blockmargin;
 			overflow: hidden;
 
 			&:hover .rftIndexMenuMask {
-				margin-top: -@im_blockheight;
+				margin-top: -@indexmenu_blockheight;
 			}
 		}
 		.rftIndexMenuMask {
-			width: @im_blockwidth;
-			height: @im_blockheight;
+			width: @indexmenu_blockwidth;
+			height: @indexmenu_blockheight;
 			background: @base1;
 			color: @headers;
@@ -23,8 +23,8 @@
 			.label {
 				color: @headers;
-				font-size: @im_font_size;
-				height: @im_font_size;
-				line-height: @im_font_size;
-				margin-top: (@im_blockheight - @im_font_size) / 2;
+				font-size: @indexmenu_font_size;
+				height: @indexmenu_font_size;
+				line-height: @indexmenu_font_size;
+				margin-top: (@indexmenu_blockheight - @indexmenu_font_size) / 2;
 				float: left;
 			}
@@ -33,5 +33,5 @@
 				.setIcon(32px);
 				float: left;
-				margin: ((@im_blockheight - @im_font_size)/2) 8px 0 8px;
+				margin: ((@indexmenu_blockheight - @indexmenu_font_size)/2) 8px 0 8px;
 			}
 		}
@@ -66,6 +66,7 @@
 
 			.indexMenuMixin (@number) when (@number > 0){
-				@height: @im_blockheight / @number;
+				@height: @indexmenu_blockheight / @number;
 				height: @height;
+				width: @indexmenu_blockwidth;
 				
 				.dijitButtonNode {
@@ -86,5 +87,5 @@
 			&.rftIndexMenuButtonHover {
 				color: @text;
-				.transition(0.1s);
+				.transition (0.1s);
 				.dijitButtonText {
 					color: @text;
@@ -110,5 +111,7 @@
 
 			&.rftIndexMenuButtonActive {
-				.setIcon (32px, black);
+				.rftIcon {
+					.setIcon (32px, black);
+				}
 				.transition(0.3s);
 				color: @darkest;
@@ -125,4 +128,5 @@
 				.flatShading;
 				color: @headers;
+				background-color: @base;
 				border: none;
 
@@ -130,5 +134,5 @@
 					color: @headers;
 					.flatShading;
-					background-color: transparent;
+					background-color: @base;
 
 					&.dijitMenuItemHover,
@@ -138,4 +142,21 @@
 							color: @text;
 						}
+
+						&.red {
+							background-color: @red;
+						}
+						&.blue {
+							background-color: @blue;
+						}
+						&.green {
+							background-color: @green;
+						}
+						&.orange {
+							background-color: @orange;
+						}
+						&.purple {
+							background-color: @purple;
+						}
+
 					}
 
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/mixins.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/mixins.css	(revision 410)
+++ 	(revision )
@@ -1,2 +1,0 @@
-
-/* This beautiful CSS-File has been crafted with LESS (lesscss.org) and compiled by simpLESS (wearekiss.com/simpless) */
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/mixins.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/mixins.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/mixins.less	(revision 411)
@@ -28,31 +28,34 @@
 
 .noMargin () {
-	margin: 0;
+	margin: 0 0 0 0;
 }
 
 .noPadding () {
-	padding: 0;
+	padding: 0 0 0 0;
 }
 //------------------------------------------
 //ICONS
 
-.setIconSize (@size, @b) when (@size =< 24px) {
+.setIconSize (@size, @b) when (@size < 24px) {
 	width: @size;
 	height: @size;
 	margin: ((24px - @size) / 2) 0;
+	.noPadding ();
 	background-image: url('images/icons/rftIcons16@{b}.png');
 }
 
-.setIconSize (@size, @b) when (@size > 24px) and (@size < 32) {
-	width: @size;
-	height: @size;
-	margin: 0;
+.setIconSize (@size, @b) when (@size >= 24px) and (@size < 32) {
+	width: 24px;
+	height: 24px;
+	.noMargin ();
+	.noPadding ();
 	background-image: url('images/icons/rftIcons24@{b}.png');
 }
 
 .setIconSize (@size, @b) when (@size >= 32px) {
-	width: @size;
-	height: @size;
+	width: 32px;
+	height: 32px;
 	margin: 0;
+	.noPadding ();
 	background-image: url('images/icons/rftIcons32@{b}.png');
 }
@@ -68,2 +71,24 @@
 }
 //------------------------------------------
+
+//Old colour settings
+//TODO: I AM NOT SURE IF THIS ACTUALLY WORKS! THOROUGHLY TEST WHEN APPLIED TO PAGES!!!!
+// Oke, wat. Deze shit is echt niet te snappen. :P Gewoon maar weer de oude meuk erin hangen?
+.blockButtonColorMixin (@color) {
+	.dijitButtonNode {
+		background-color: @@color;
+	}
+
+	&.dijitHover {
+		.dijitButtonNode {
+			background-color: @text;
+		}
+	}
+	&.dijitActive {
+		.dijitButtonNode {
+			@colorName: "@{color}_light";
+			background-color: @@colorName;
+		}
+	}
+
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/pages/questions.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/pages/questions.less	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/pages/questions.less	(revision 411)
@@ -0,0 +1,23 @@
+#rft.claro {
+	.page_questions {
+		
+		.rftSelector {
+			.rftSelectorCategory .rftLineWithActions {
+				.bgColor ("orange");
+			}
+
+			.rftSelectorSelected { 
+				.rftLineWithActions {
+					.bgColor ("text");
+					color: @darkest;
+				}
+
+				.rftBlockButton {
+					background-color: #ff00ff;
+					.blockButtonColorMixin ("orange");
+				}
+				
+			}
+		}
+	}
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftButtons.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftButtons.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftButtons.less	(revision 411)
@@ -47,24 +47,24 @@
 		}
 
-		//colors
+		//colors on hover
 		span.blue.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
 		.blue .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-			color: #0794d1;
+			color: @blue_light;
 		}
 		span.orange.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
 		.orange .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-			color: #ff9140;
+			color: @orange_light;
 		}
 		span.green.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
 		.green .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-			color: #79ca0a;
+			color: @green_light;
 		}
 		span.red.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
 		.red .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-			color: #bd0013;
+			color: @red_light;
 		}
 		span.purple.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
 		.purple .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-			color: #993dec;
+			color: @purple_light;
 		}
 
@@ -76,8 +76,11 @@
 			height: @button_block_height;
 			line-height: @button_block_height;
+			vertical-align: top;
 
 			.dijitButtonNode {
 				.flatShading;
 				.transition (0.3s);
+				line-height: @button_block_height;
+				vertical-align: top;
 				height: @button_block_height;
 				padding: 0 @std_offset;
@@ -87,5 +90,5 @@
 
 				.rftIcon {
-					.setIcon(24px);
+					.setIcon(16px);
 				}
 			}
@@ -95,60 +98,30 @@
 				.transition (0.1s);
 				.rftIcon {
-					.setIcon(24px, black);
+					vertical-align: top;
+					.setIcon(16px, black);
 				}
 			}
+
+			//Disabled because this is presumably useless
+			// &.blue {
+			// 	.blockButtonColorMixin ("blue");
+			// }
+			// &.green {
+			// 	.blockButtonColorMixin ("green");
+			// }
+			// &.orange {
+			// 	.blockButtonColorMixin ("orange");
+			// }
+			// &.red {
+			// 	.blockButtonColorMixin ("red");
+			// }
+			// &.purple {
+			// 	.blockButtonColorMixin ("purple");
+			// }
 		}
 
-		//Old colour settings
-		//TODO: I AM NOT SURE IF THIS ACTUALLY WORKS! THOROUGHLY TEST WHEN APPLIED TO PAGES!!!!
-		// Oke, wat. Deze shit is echt niet te snappen. :P Gewoon maar weer de oude meuk erin hangen?
-		.buttonColorMixin (@color) {
-			&.rftBlockButtonHover {
-				.dijitButtonNode {
-					background-color: @@color;
-				}
-				&.light {
-					.dijitButtonNode {
-						@colorName: "@{color}_light";
-						background-color: @@colorName;
-					}
-				}
-			}
-			.rftBlockButtonHover {
-				.dijitButtonNode {
-					background-color: @@color;
-				}
-				&.light {
-					.dijitButtonNode {
-						@colorName: "@{color}_light";
-						background-color: @@colorName;
-					}
-				}
-			}
-			&.light {
-				.rftBlockButtonHover {
-					.dijitButtonNode {
-						@colorName: "@{color}_light";
-						background-color: @@colorName;
-					}
-				}
-			}
-		}
+		
 
-		.blue {
-			.buttonColorMixin ("blue");
-		}
-		.green {
-			.buttonColorMixin ("green");
-		}
-		.orange {
-			.buttonColorMixin ("orange");
-		}
-		.red {
-			.buttonColorMixin ("red");
-		}
-		.purple {
-			.buttonColorMixin ("purple");
-		}
+		
 
 
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftIcons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftIcons.css	(revision 410)
+++ 	(revision )
@@ -1,180 +1,0 @@
-#rft .claro .rftIcon {
-  margin: 0;
-  padding: 0;
-  float: left;
-  display: inline-block;
-  border: none;
-  background-color: transparent;
-  background-repeat: no-repeat;
-}
-#rft .claro .rftIcon.rftMainIcon {
-  background-image: url('images/icons/rftIcons32png');
-  width: 32px;
-  height: 32px;
-  margin: 0;
-}
-#rft .claro .rftIcon.rftMidIcon {
-  background-image: url('images/icons/rftIcons24png');
-  width: 24px;
-  height: 24px;
-  margin: 0px 0;
-}
-#rft .claro .rftIcon.rftSmallIcon {
-  background-image: url('images/icons/rftIcons16png');
-  width: 16px;
-  height: 16px;
-  margin: 4px 0;
-}
-#rft .rftIconApplication {
-  background-position: 0px 0px;
-}
-#rft .rftIconDashboard {
-  background-position: -32px 0px;
-}
-#rft .rftIconSession {
-  background-position: -64px 0px;
-}
-#rft .rftIconSessionActive {
-  background-position: -96px 0px;
-}
-#rft .rftIconSessionTemplate {
-  background-position: -128px 0px;
-}
-#rft .rftIconSurvey {
-  background-position: -160px 0px;
-}
-#rft .rftIconQuestion {
-  background-position: -192px 0px;
-}
-#rft .rftIconQuestionFill {
-  background-position: -224px 0px;
-}
-#rft .rftIconRespondent {
-  background-position: -256px 0px;
-}
-#rft .rftIconAnswer {
-  background-position: -288px 0px;
-}
-#rft .rftIconAnswerSet {
-  background-position: -320px 0px;
-}
-#rft .rftIconGameData {
-  background-position: -352px 0px;
-}
-#rft .rftIconUser {
-  background-position: -384px 0px;
-}
-#rft .rftIconAccept {
-  background-position: -416px 0px;
-}
-#rft .rftIconCancel {
-  background-position: -448px 0px;
-}
-#rft .rftIconPlus {
-  background-position: -480px 0px;
-}
-#rft .rftIconMinus {
-  background-position: -512px 0px;
-}
-#rft .rftIconIncrease {
-  background-position: -544px 0px;
-}
-#rft .rftIconDecrease {
-  background-position: -576px 0px;
-}
-#rft .rftIconDelete {
-  background-position: -608px 0px;
-}
-#rft .rftIconHome {
-  background-position: -640px 0px;
-}
-#rft .rftIconPreview {
-  background-position: -672px 0px;
-}
-#rft .rftIconSave {
-  background-position: -704px 0px;
-}
-#rft .rftIconDiscard {
-  background-position: -736px 0px;
-}
-#rft .rftIconProperties {
-  background-position: -768px 0px;
-}
-#rft .rftIconUndo {
-  background-position: -800px 0px;
-}
-#rft .rftIconRedo {
-  background-position: -832px 0px;
-}
-#rft .rftIconBack {
-  background-position: -864px 0px;
-}
-#rft .rftIconForward {
-  background-position: -896px 0px;
-}
-#rft .rftIconRefresh {
-  background-position: -928px 0px;
-}
-#rft .rftIconHelp {
-  background-position: -960px 0px;
-}
-#rft .rftIconInspect {
-  background-position: -992px 0px;
-}
-#rft .rftIconTag {
-  background-position: -1024px 0px;
-}
-#rft .rftIconImage {
-  background-position: -1056px 0px;
-}
-#rft .rftIconEdit {
-  background-position: -1088px 0px;
-}
-#rft .rftIconLock {
-  background-position: -1120px 0px;
-}
-#rft .rftIconUnlock {
-  background-position: -1152px 0px;
-}
-#rft .rftIconPreset {
-  background-position: -1184px 0px;
-}
-#rft .rftIconTextBlock {
-  background-position: -1216px 0px;
-}
-#rft .rftIconPageBreak {
-  background-position: -1248px 0px;
-}
-#rft .rftIconExternal {
-  background-position: -1280px 0px;
-}
-#rft .rftIconInput {
-  background-position: -1312px 0px;
-}
-#rft .rftIconPublish {
-  background-position: -1344px 0px;
-}
-#rft .rftIconFullArrowUp {
-  background-position: -1696px 0px;
-}
-#rft .rftIconFullArrowDown {
-  background-position: -1728px 0px;
-}
-#rft .rftIconFullArrowLeft {
-  background-position: -1760px 0px;
-}
-#rft .rftIconFullArrowRight {
-  background-position: -1792px 0px;
-}
-#rft .rftIconHalfArrowUp {
-  background-position: -1824px 0px;
-}
-#rft .rftIconHalfArrowDown {
-  background-position: -1856px 0px;
-}
-#rft .rftIconHalfArrowLeft {
-  background-position: -1888px 0px;
-}
-#rft .rftIconHalfArrowRight {
-  background-position: -1920px 0px;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftIcons.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftIcons.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftIcons.less	(revision 411)
@@ -9,13 +9,14 @@
 			background-repeat: no-repeat;
 
-			&.rftMainIcon {
-				.setIcon(@icon_mainSize);
-			}
-			&.rftMidIcon {
-				.setIcon(@icon_midSize);
-			}
-			&.rftSmallIcon {
-				.setIcon(@icon_smallSize);
-			}
+			//Probably not needed anymore! Commenting out to see if code breaks
+			// &.rftMainIcon {
+			// 	.setIcon(@icon_mainSize);
+			// }
+			// &.rftMidIcon {
+			// 	.setIcon(@icon_midSize);
+			// }
+			// &.rftSmallIcon {
+			// 	.setIcon(@icon_smallSize);
+			// }
 
 		}
@@ -61,6 +62,5 @@
 		background-position: -384px 0px;
 	}
-	
-	//Actions
+		//Actions
 	.rftIconAccept {
 		background-position: -416px 0px;
@@ -153,5 +153,4 @@
 		background-position: -1344px 0px;
 	}
-
 	//Arrows
 	.rftIconFullArrowUp {
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithActions.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithActions.css	(revision 410)
+++ 	(revision )
@@ -1,54 +1,0 @@
-#rft .claro .rftLineWithButtons {
-  border: none;
-  background-image: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  position: relative;
-  height: 24px;
-  white-space: nowrap;
-  margin: 4px 0;
-}
-#rft .claro .rftLineWithButtons.dojoDndItem {
-  -webkit-transition: all 0.2s;
-  -moz-transition: all 0.2s;
-  -o-transition: all 0.2s;
-  -ms-transition: all 0.2s;
-  transition: all 0.2s;
-}
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemBefore {
-  margin-top: 6px;
-  border-top: 6px solid #ffffff;
-}
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemAfter {
-  margin-bottom: 6px;
-  border-bottom: 6px solid #ffffff;
-}
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemover,
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemAnchor {
-  background-image: none;
-  border: none;
-  padding: 2px;
-}
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemover *,
-#rft .claro .rftLineWithButtons.dojoDndItem.dojoDndItemAnchor * {
-  background-color: rgba(255, 255, 255, 0.1);
-}
-#rft .claro .rftLineWithButtons .rftLineWithButtonsTitle {
-  float: left;
-  margin: 0 8px;
-  overflow: hidden;
-  white-space: nowrap;
-  word-wrap: break-word;
-}
-#rft .claro .rftLineWithButtons .rftLineWithButtonsButtons {
-  margin: 0;
-  padding: 0;
-  line-height: 24px;
-  height: 24px;
-  position: absolute;
-  right: 0;
-  float: left;
-}
-#rft .claro .dojoDndSourceMoved .rftLineWithButtons.dojoDndItemAnchor {
-  height: 0;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithActions.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithActions.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithActions.less	(revision 411)
@@ -4,5 +4,5 @@
 	&.claro {
 
-		.rftLineWithButtons {
+		.rftLineWithActions {
 			.flatShading();
 			position: relative;
@@ -10,4 +10,5 @@
 			white-space: nowrap;
 			margin: @std_offset 0;
+			color: @text;
 
 			&.dojoDndItem {
@@ -26,12 +27,10 @@
 					border: none;
 					padding: 2px;
-					* {
-						background-color: fade(#fff, 10%);	// Not sure if this will work.
-						// This is an attempt to lighten the rftLWB's colour by overlaying with transparent white.
-					}
+					background-color: fade(#fff, 10%);	// Not sure if this will work.
+					// This is an attempt to lighten the rftLWA's colour by overlaying with transparent white.
 				}
 			}
 
-			.rftLineWithButtonsTitle {
+			.rftLineWithActionsTitle {
 				float: left;
 				margin: 0 8px;
@@ -41,5 +40,5 @@
 			}
 
-			.rftLineWithButtonsButtons {
+			.rftLineWithActionsButtons {
 				.noOffset();
 				line-height: @std_height;
@@ -50,7 +49,8 @@
 			}
 		}
-		
+
+		// Make the currently lineWithActions draggable "wipe out" when dragging, so only the Avatar is visible!
 		.dojoDndSourceMoved {
-			.rftLineWithButtons.dojoDndItemAnchor {
+			.rftLineWithActions.dojoDndItemAnchor {
 				height: 0;
 			}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithButtons.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithButtons.less	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftLineWithButtons.less	(revision 411)
@@ -0,0 +1,60 @@
+@dndBorderSize: 6px;
+
+#rft {	//rft nameSpace, apply this to base page! Adds 1000 to specificity by default, so easier overrides of Claro
+	&.claro {
+
+		.rftLineWithActions {
+			.flatShading();
+			position: relative;
+			height: @std_height;
+			white-space: nowrap;
+			margin: @std_offset 0;
+			//Color ("blue");
+
+			&.dojoDndItem {
+				.transition;
+
+				&.dojoDndItemBefore {
+					margin-top: @dndBorderSize;
+					border-top: @dndBorderSize solid @text;
+				}
+				&.dojoDndItemAfter {
+					margin-bottom: @dndBorderSize;
+					border-bottom: @dndBorderSize solid @text;
+				}
+				&.dojoDndItemover, &.dojoDndItemAnchor {
+					background-image: none;
+					border: none;
+					padding: 2px;
+					* {
+						background-color: fade(#fff, 10%);	// Not sure if this will work.
+						// This is an attempt to lighten the rftLWB's colour by overlaying with transparent white.
+					}
+				}
+			}
+
+			.rftLineWithActionsTitle {
+				float: left;
+				margin: 0 8px;
+				overflow: hidden;
+				white-space: nowrap;
+				word-wrap: break-word;
+			}
+
+			.rftLineWithActionsButtons {
+				.noOffset();
+				line-height: @std_height;
+				height: @std_height;
+				position: absolute;
+				right: 0;
+				float: left;
+			}
+		}
+		
+		.dojoDndSourceMoved {
+			.rftLineWithActions.dojoDndItemAnchor {
+				height: 0;
+			}
+		}	
+	}
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftObjectBox.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftObjectBox.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftObjectBox.less	(revision 411)
@@ -11,5 +11,5 @@
 			}
 
-			.rftLineWithButtons {
+			.rftLineWithActions {
 				.noOffset;
 			}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftSelector.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftSelector.css	(revision 410)
+++ 	(revision )
@@ -1,30 +1,0 @@
-#rft .claro .rftSelector {
-  margin: 0;
-  padding: 0;
-  margin: 4px 8px;
-}
-#rft .claro .rftSelector .rftLineWithButtons {
-  margin: 0;
-  padding: 0;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor {
-  margin: 0;
-  padding: 0;
-  float: left;
-  width: 8px;
-  height: 24px;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.conflict {
-  background-color: #ff0000;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.pending {
-  background-color: #ff8000;
-}
-#rft .claro .rftSelector .rftSelectorSelected .rftSelectorColor.success {
-  background-color: #00ff00;
-}
-#rft .claro .rftSelector .rftSelectorOptions .rftLineWithButtons,
-#rft .claro .rftSelector .rftSelectorSelected .rftLineWithButtons {
-  background-color: #ffffff;
-  color: #111111;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftSelector.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftSelector.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/rftSelector.less	(revision 411)
@@ -6,5 +6,5 @@
 
 #rft {
-	.claro {
+	&.claro {
 		
 		.rftSelector {
@@ -12,5 +12,5 @@
 			margin: @std_offset;
 
-			.rftLineWithButtons {
+			.rftLineWithActions {
 				.noOffset;
 			}
@@ -18,9 +18,10 @@
 			.rftSelectorSelected {
 				// Operation indicator styling
-				.rftSelectorColor {
+				.rftSelectorIndicator {
 					.noOffset;
 					float: left;
 					width: @indicatorWidth;
 					height: @std_height;
+					background-color: #bedead;
 
 					&.conflict {
@@ -38,5 +39,5 @@
 			.rftSelectorOptions, .rftSelectorSelected {
 
-				.rftLineWithButtons {
+				.rftLineWithActions {
 					background-color: @text;
 					color: @darkest;
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/sessions.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/sessions.less	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/sessions.less	(revision 411)
@@ -0,0 +1,19 @@
+#rft {
+	&.claro {
+
+		.rftObjectBox {
+			.noPadding ();
+			color: @text;
+
+			.typeIcon.rftIcon {
+				.setIcon(32px);
+			}
+
+			.rftLineWithActions {
+				background-color: @green;
+			}
+
+		}
+
+	}
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/LESS/variables.less
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/LESS/variables.less	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/LESS/variables.less	(revision 411)
@@ -41,8 +41,8 @@
 
 // IndexMenu
-@im_blockheight: 400px;
-@im_blockwidth: 400px;
-@im_blockmargin: 16px;
-@im_font_size: 32px;
+@indexmenu_blockheight: 400px;
+@indexmenu_blockwidth: 400px;
+@indexmenu_blockmargin: 16px;
+@indexmenu_font_size: 32px;
 
 // Mainmenu
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/claroOverride.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/claroOverride.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/claroOverride.css	(revision 411)
@@ -0,0 +1,108 @@
+/* This stylesheet compensates for the restoration of the claro style to its original specs. (21-6-2012)
+ * These changes should be moved to relevant stylesheets as soon as possible!
+*/
+
+
+/* Menu.css */
+.claro .topbar .dijitMenuitem {
+    width: 90px;
+    background-image: none;
+    background-position: top;
+    text-align: center;
+}
+.claro .dijitMenuPassive .dijitMenuItemHover, .claro .dijitMenuPassive .dijitMenuItemSelected {
+    background-color: transparent;
+    color: #ffffff;
+    border: none;
+    padding: 0 4px;
+}
+.claro .dijitMenuPassive .dijitMenuItemActive {
+    background-position: top;
+}
+
+/* layout/BorderContainer.css */
+.claro .dijitSplitContainer-child, .claro .dijitBorderContainer-child {
+    border: none;
+}
+.claro .dijitTabContainerTop-dijitContentPane,
+.claro .dijitTabContainerLeft-dijitContentPane,
+.claro .dijitTabContainerBottom-dijitContentPane,
+.claro .dijitTabContainerRight-dijitContentPane,
+.claro .dijitAccordionContainer-dijitContentPane {
+    background-color: transparent;
+}
+.claro .dijitSplitContainer-dijitContentPane,
+.claro .dijitBorderContainer-dijitContentPane {
+    background-color: transparent;
+}
+
+/* layout/TabContainer.css */
+.claro .dijitTabPaneWrapper {
+    background: transparent;
+}
+.claro .dijitTabInnerDiv {
+    background-color: transparent;
+    color: #999999;
+    border: none;
+}
+.claro .dijitTabContent {
+    border: none;
+}
+.claro .dijitTabHover .dijitTabInnerDiv {
+    background-color: transparent;
+    color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabInnerDiv {
+    color: #0072bc;
+}
+.claro .dijitTabChecked .dijitTabInnerDiv {
+    background-color: transparent;
+    color: #ffffff;
+}
+.claro .dijitTabContent {
+    border: 1px solid #999999;
+}
+.claro .dijitTabHover .dijitTabContent {
+    border-color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabContent {
+    border-color: transparent;
+}
+.claro .dijitTabChecked .dijitTabContent {
+    color: #ffffff;
+    border-color: #0072bc;
+}
+/*lefttabs*/
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+    border-width: 1px;
+    left: 0;
+    margin-bottom: 4px;
+    margin-right: 8px;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv {
+    border: none;
+    background: transparent;
+    background-image: none;
+    background-position: top;
+    background-repeat: no-repeat;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+    padding: 3px 8px 4px 8px;
+    background-image: none;
+
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabContent {
+    padding-right: 8px;
+    background-image: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv {
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv,
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+    -moz-border-radius: 0;
+    border-radius: 0;
+    border: none;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/general.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/general.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/general.css	(revision 411)
@@ -0,0 +1,6 @@
+/* General.css contains general fixes that are not strongly related to any other stylesheets.
+They are typically small fixes or tweaks to adjust spacing and/or borders/colours */
+
+.claro .dijitTabPaneWrapper {
+    border: none;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/layout.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/layout.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/layout.css	(revision 411)
@@ -0,0 +1,607 @@
+*:focus {
+    /* Disabled Chrome focus outlines! */
+    outline: none;
+}
+html,body {
+    width: 100%;
+    height: 100%;
+    font-size: 13px;
+    background-color: #333333;
+}
+.claro {
+    font-family: 'Segoe UI', Verdana, Arial, Helvetica, sans-serif;
+    color: #000000;
+}
+
+/* Headings */
+.claro h1 {   
+    float: left;
+    clear: left;
+    font-size: 48px;
+    color: #999999;
+    margin: 0 10px 8px 10px;
+    padding: 0;
+    line-height: 48px;
+    font-weight: normal !important;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+}
+.claro h2 {
+    /* Content pane title */
+    color: #ffffff;
+    font-size: 22px;
+    line-height: 30px;
+    margin: 0;
+    padding: 0;
+}
+.claro h2 .rftIcon {
+    float: left;
+    width: 32px;
+    height: 32px;
+    background-image: url('images/icons/rftIcons32.png');
+    margin-right: 8px;
+}
+.claro h3 {
+    /* Section headers */
+    font-size: 18px;
+    margin: 0 0 4px 0;
+}
+.claro h4 {
+    /* Small text headers/paragraph headers */
+    font-size: 16px;
+}
+
+/* Topbar  */
+.claro .topbar {
+    overflow-y: hidden;
+}
+.claro .topbar .dijitMenuBar {
+    border: none;
+    background-color: transparent;
+    background-image: none;    
+    float: right;
+    clear: right;
+    margin-top: 16px;
+}
+
+/* Breadcrumbs */
+.claro .breadcrumbs {
+    float: left;
+    clear: left;
+    width: 100%;
+    text-align: center;
+    height: 16px;
+    line-height: 16px;
+    margin: 0 0 4px 0;
+}
+.claro .breadcrumbs .breadcrumb {
+    color: #999999;
+    font-size: 13px;
+}
+.claro .breadcrumbs .breadcrumb.breadcrumbCurrent {
+    color: #ffffff;
+    font-size: 14px;
+}
+.claro .breadcrumbs .breadcrumb.breadcrumbHover {
+    color: #0072bc;
+}
+
+/* Content */
+.claro .dijitContentPane.page {
+    padding: 0;
+}
+.claro .content.dijitContentPane {
+    display: block;
+    clear: both;
+    padding: 0;
+    background-color: #555555;
+    /* Background gradient time! */
+    background: -webkit-radial-gradient(
+        50% 50%, 
+        circle, 
+        #666666 1%,
+        #444444 100%
+        );
+    background: -moz-radial-gradient(
+        50% 50%, 
+        circle, 
+        #666666 1%,
+        #444444 100%
+        );
+}
+.claro .content.dijitContentPane .dijitBorderContainer {
+    padding: 2px;
+}
+
+
+
+
+
+
+
+
+
+
+/* General */
+.loginLabel {
+    float: left;
+    clear: left;
+    width: 100px;
+}
+.loginInput {
+    float: left;
+    clear: right;
+    width: 150px;
+}
+.rftMultipleChoiceWidget {
+    display: table;
+}
+.rftMultipleChoiceWidget .row {
+    display: table-row;
+}
+.rftMultipleChoiceWidget .rowBox {
+    display: table-cell;
+}
+.rftMultipleChoiceWidget .rowText {
+    display: table-cell;
+    width: 100px;
+}
+.rftMultipleChoiceWidget .rowBtn {
+    display: table-cell;
+    width: 30px;
+}
+.verticalTabList {
+    width: 190px;
+}
+
+/* Tabs */
+.claro .dijitTabContainerLeft-tabs {
+    border: none;
+    padding: 4px 16px 4px 4px;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+    margin: 4px 0;
+    width: 200px;
+    min-height: 30px;
+    border: 1px solid #888888;
+}
+.claro .dijitTab {
+    background-color: transparent;
+    padding: 2px 8px;
+    color: #999999;
+    white-space: normal;
+    overflow: hidden;
+    transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTab .dijitTabContent {
+    height: 48px;
+    line-height: 24px;
+    width: 190px;
+}
+.claro .dijitTab.dijitTabHover {
+    color: #ffffff;
+    border-color: #ffffff;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .dijitTab.dijitTabActive {
+    color: #0072bc;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .dijitTab.dijitTabChecked {
+    color: #ffffff;
+    border: 1px solid transparent;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .dijitTabContainer.blue .dijitTab.dijitTabChecked {
+    background-color: #0072bc;
+}
+.claro .dijitTabContainer.orange .dijitTab.dijitTabChecked {
+    background-color: #ff5b12;
+}
+.claro .dijitTabContainer.red .dijitTab.dijitTabChecked {
+    background-color: #8c0310;
+}
+.claro .dijitTabContainer.purple .dijitTab.dijitTabChecked {
+    background-color: #6529b7;
+}
+.claro .dijitTabContainer.green .dijitTab.dijitTabChecked {
+    background-color: #3aa605;
+}
+.claro .dijitTabContainer.blue .dijitTab.dijitTabActive {
+    color: #0072bc;
+}
+.claro .dijitTabContainer.orange .dijitTab.dijitTabActive {
+    color: #ff5b12;
+}
+.claro .dijitTabContainer.red .dijitTab.dijitTabActive {
+    color: #8c0310;
+}
+.claro .dijitTabContainer.purple .dijitTab.dijitTabActive {
+    color: #6529b7;
+}
+.claro .dijitTabContainer.green .dijitTab.dijitTabActive {
+    color: #3aa605;
+}
+
+/* Index Menu */
+.claro .rftIndexMenuBlock {
+    width: 400px;
+    height: 400px;
+    background: #444444;
+    float: left;
+    margin: 16px;
+    overflow: hidden;
+}
+.claro .rftIndexMenuMask {
+    height: 400px;
+    width: 400px;
+    background: #444444;
+    color: #999999;
+    margin-top: 0;
+}
+.claro .rftIndexMenuBlock:hover .rftIndexMenuMask {
+    margin-top: -400px;
+}
+.claro .rftIndexMenuMask .label {
+    color: #999999;
+    font-size: 32px;
+    line-height: 28px;
+    height: 32px;
+    margin: 184px 0;
+    float: left;
+}
+.claro .rftIndexMenuMask .rftIcon {
+    width: 32px;
+    height: 32px;
+    background-image: url('images/icons/rftIcons32.png');
+    margin: 184px 8px 0 8px;
+    float: left;
+}
+
+
+/* Inputs */
+fieldset {
+    border: none;
+}
+fieldset.align input,
+fieldset.align .dijitTextBox,
+fieldset.align textarea {
+    margin-left: 0;
+}
+fieldset.align label {
+    color: #ffffff;
+    display: inline-block;
+    width: 100px !important;
+}
+
+.claro .newline {
+    display: block;
+}
+
+/* Question editor/Survey Advanced editor */
+.claro .QuestionEditor .PreviewWindow {
+    /* Nothing yet, put preview window styling options here after we've decided on a format to follow! */
+}
+.claro .dijitAccordionContainer {
+    /* No styling for now, use this for margins and other layout-related business. This class does not affect the look of the AccordionContainer currently! */
+}
+.claro .dijitAccordionInnerContainer {
+    /* This contains a title and a childWrapper. The two of these make up one "item" in the Accordion element */
+    border: none;
+    border-color: #333333;
+    background-color: #0072bc;
+    margin-bottom: 0;
+}
+.claro .dijitAccordionInnerContainer {
+    background-color: transparent;
+}
+.claro .dijitAccordionTitle, .claro .dijitAccordionTitleSelected {
+    background-color: #0072bc;
+    background-image: none;
+    color: #ffffff;
+}
+.claro .dijitAccordionTitle .rftIcon {
+    width: 16px;
+    height: 16px;
+    background-image: url('images/icons/rftIcons16b.png');
+    margin: 0 4px 2px 0;
+}
+.claro .dijitAccordionTitleSelected .rftIcon {
+    background-image: url('images/icons/rftIcons16.png');
+}
+.claro .dijitAccordionContainer.blue .dijitAccordionTitle, .claro .dijitAccordionContainer.blue .dijitAccordionTitleSelected {
+    background-color: #0072bc;
+}
+.claro .dijitAccordionContainer.blue .dijitAccordionTitleHover {
+    background-color: #0794d1;
+}
+.claro .dijitAccordionContainer.orange .dijitAccordionTitle, .claro .dijitAccordionContainer.orange .dijitAccordionTitleSelected {
+    background-color: #ff5b12;
+}
+.claro .dijitAccordionContainer.orange .dijitAccordionTitleHover {
+    background-color: #ff9140;
+}
+.claro .dijitAccordionText {
+    color: #ffffff;
+}
+.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
+    background-color: #444444;
+    border: none !important;
+    padding: 0;
+    margin: 0;
+}
+.claro .dijitAccordionContainer .dijitAccordionInnerContainerSelectedHover .dijitAccordionChildWrapper,
+.claro .dijitAccordionContainer .dijitAccordionInnerContainerSelectedActive .dijitAccordionChildWrapper {
+    border: none;
+    box-shadow: none;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    /* Override the box shadow and offset on hover */
+}
+
+/* DojoX.TitleGroup, replacement of AccordionContainer in Question Editor */
+.claro .dojoxTitleGroup {
+    /* No styling yet */
+}
+.claro .dojoxTitleGroup .dijitTitlePane {
+    margin: 0;
+}
+.claro .orange .dojoxTitleGroup .dijitTitlePaneTitle {
+    background-color: #ff5b12;
+    background-image: none;
+    border: none;
+    padding: 0 4px;
+    height: 24px;
+    margin: 0;
+}
+.claro .orange .dojoxTitleGroup .dijitTitlePaneTitleHover, 
+.claro .orange .dojoxTitleGroup .dijitTitlePanelTitleFocused {
+    background-color: #ff9140;
+}
+.claro .dojoxTitleGroup .dijitTitlePaneTextNode {
+    color: #ffffff;
+    font-size: 13px;
+    line-height: 24px;
+}
+.claro .dojoxTitleGroup .dijitTitlePaneContentOuter {
+    background-color: #444;
+    border: none;
+}
+.claro .dojoxTitleGroup .dijitTitlePaneTitleFocus {
+    margin: 0;
+}
+
+/****************************************************
+/*  Self- and Inherit Colours
+/***************************************************/
+
+/* InheritColours */
+.claro .inheritBgColor,
+.claro .bg {
+    transition: all 0.2s;
+    -moz-transition: all 0.2s;
+    -webkit-transition: all 0.2s;
+}
+.claro .blue .inheritBgColor {
+    background-color: #0072bc;
+    color: #ffffff;
+}
+.claro .blue.light .inheritBgColor,
+.claro .blue .light.inheritBgColor {
+    background-color: #0794d1;
+    color: #ffffff;
+}
+.claro .green .inheritBgColor {
+    background-color: #3aa605;
+    color: #ffffff;
+}
+.claro .green.light .inheritBgColor,
+.claro .green .light.inheritBgColor {
+    background-color: #79ca0a;
+    color: #ffffff;
+}
+.claro .orange .inheritBgColor {
+    background-color: #ff5b12;
+    color: #ffffff;
+}
+.claro .orange.light .inheritBgColor,
+.claro .orange .light.inheritBgColor {
+    background-color: #ff9140;
+    color: #ffffff;
+}
+.claro .red .inheritBgColor {
+    background-color: #8c0310;
+    color: #ffffff;
+}
+.claro .red.light .inheritBgColor,
+.claro .red .light.inheritBgColor {
+ background-color: #bd0013;
+ color: #ffffff;   
+}
+.claro .purple .inheritBgColor {
+    background-color: #6529b7;
+    color: #ffffff;
+}
+.claro .purple.light .inheritBgColor,
+.claro .purple .light.inheritBgColor {
+    background-color: #993dec;
+    color: #ffffff;
+}
+.claro .white .inheritBgColor {
+    background-color: #ffffff;
+    color: #000000;
+}
+.claro .black .inheritBgColor {
+    background-color: #000000;
+    color: #ffffff;
+}
+.claro .trans .inheritBgColor,
+.claro .trans.bg {
+    background: transparent;
+    color: #ffffff;
+}
+
+/*SelfColours! */
+.claro .blue.bg {
+    background-color: #0072bc;
+    color: #ffffff;
+}
+.claro .blue.light.bg {
+    background-color: #0794d1;
+    color: #ffffff;
+}
+.claro .green.bg {
+    background-color: #3aa605;
+    color: #ffffff;
+}
+.claro .green.light.bg {
+    background-color: #79ca0a;
+    color: #ffffff;
+}
+.claro .orange.bg {
+    background-color: #ff5b12;
+    color: #ffffff;
+}
+.claro .orange.light.bg {
+    background-color: #ff9140;
+    color: #ffffff;
+}
+.claro .red.bg {
+    background-color: #8c0310;
+    color: #ffffff;
+}
+.claro .red.light.bg {
+    background-color: #bd0013;
+    color: #ffffff;   
+}
+.claro .purple.bg {
+    background-color: #6529b7;
+    color: #ffffff;
+}
+.claro .purple.light.bg {
+    background-color: #993dec;
+    color: #ffffff;
+}
+.claro .white.bg {
+    background-color: #ffffff;
+    color: #000000;
+}
+.claro .black.bg {
+    background-color: #000000;
+    color: #ffffff;
+}
+.claro .trans.bg {
+    background: transparent;
+    color: #ffffff;
+}
+
+/*************************************/
+/*  Dropdown menu on MenuBar
+/*************************************/
+.claro .dijitMenuPopup {
+
+}
+.claro .dijitMenuPopup .dijitMenu {
+    border: none;
+    background-color: #333333;
+    background-image: none;
+    color: #999999;   
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItem {
+    color: #999999;
+    background-image: none;
+    background-color: transparent;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.blue,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.blue {
+    background-color: #0072bc;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.orange,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.orange {
+    background-color: #ff5b12;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.purple,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.purple {
+    background-color: #6529b7;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.green,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.green {
+    background-color: #3aa605;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.red,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.red {
+    background-color: #8c0310;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover .dijitMenuItemLabel,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemActive .dijitMenuItemLabel,
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected .dijitMenuItemLabel {
+    color: #ffffff;
+}
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItem .rftIcon {
+    height: 16px;
+    width: 16px;
+    margin: 0;
+    margin-right: 4px;
+    background-image: url('images/icons/rftIcons16.png');
+} 
+.claro .dijitMenuPopup .dijitMenu .dijitMenuItemActive .rftIcon {
+    background-image: url('images/icons/rftIcons16b.png');
+}
+
+
+/* Alignment */
+.claro .floatRight {
+    float: right;
+    margin: 0;
+    padding: 0;
+}
+
+
+/* SurveyListView */
+.claro .rftSurveyListView {
+}
+.claro .rftSurveyListView .rftSurveyListViewContent {
+    height: 300px;
+    background: #444444;
+    overflow: auto;
+}
+.claro .rftSurveyListView .rftLineWithActions .rftLineWithActionsTitle {
+    max-width: 200px;
+    overflow: hidden;
+}
+
+/* AccountListView */
+.claro .rftAccountListView .rftLineWithActions .rftLineWithActionsTitle {
+    max-width: 400px;
+    overflow: auto;
+}
+/* Generic list with lines */
+.claro .rftLineListView {
+    max-width: 200px;
+    max-height: 500px;
+}
+.claro .rftLineListView .rftLineListViewContent {
+    max-width: 200px;
+    overflow: auto;
+}
+
+
+/* Two column tables */
+.labelsAndValues-labelCell {
+  padding-left: 5px;
+}
+.labelsAndValues-valueCell {
+  padding-left: 20px;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/main.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/main.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/main.css	(revision 411)
@@ -0,0 +1,13 @@
+@import url('external.css');
+@import url('claroOverride.css');
+
+@import url('layout.css');
+@import url('general.css');
+
+@import url('rftLineWithActions.css');
+@import url('rftButtons.css');
+@import url('rftIcons.css');
+@import url('rftSelector.css');
+@import url('rftObjectBox.css');
+@import url('sessionEditor.css');
+@import url('surveyEditor.css');
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftButtons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftButtons.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftButtons.css	(revision 411)
@@ -0,0 +1,408 @@
+/****************************************************
+/*  LargeButton
+/***************************************************/
+.claro .rftLargeButton, 
+.claro .rftLargeButton * {
+    user-select: none;
+    -webkit-user-select: none;
+}
+.claro .rftLargeButton {
+    margin-right: 16px;
+    height: 30px;
+}
+.claro .rftLargeButton .dijitButtonNode {
+    border: none;
+    height: 24px;
+    background-image: none;
+    background: transparent;
+    color: #999999;
+    font-size: 20px;
+    box-shadow: none;
+    transition: color 0.3s;
+    -moz-transition: color 0.3s;
+    -webkit-transition: color 0.3s;
+    -o-transition: color 0.3s;
+}
+.claro .rftLargeButton .rftIcon {
+    width: 24px;
+    height: 24px;
+    background-image: url('images/icons/rftIcons24.png');
+}
+.claro .rftLargeButton.black .rftIcon {
+    background-image: url('images/icons/rftIcons24b.png');
+}
+.claro .rftLargeButton .dijitButtonText {
+    line-height: 24px;
+    margin-left: 6px;
+    padding: 0;
+}
+.claro .rftLargeButton.rftLargeButtonHover .dijitButtonNode {
+    transition: color 0.1s;
+    -moz-transition: color 0.1s;
+    -webkit-transition: color 0.1s;
+    -o-transition: color 0.1s;
+    color: #ffffff;
+}
+.claro .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    transition: color 0.1s;
+    -moz-transition: color 0.1s;
+    -webkit-transition: color 0.1s;
+    -o-transition: color 0.1s;
+}
+.claro span.blue.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+.claro .blue .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    color: #0794d1;
+}
+.claro span.orange.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+.claro .orange .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    color: #ff9140;
+}
+.claro span.green.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+.claro .green .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    color: #79ca0a;
+}
+.claro span.red.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+.claro .red .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    color: #bd0013;
+}
+.claro span.purple.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+.claro .purple .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+    color: #993dec;
+}
+
+/****************************************************
+/*  BlockButton
+/***************************************************/
+
+.claro .rftBlockButton {
+    height: 24px;
+    margin: 0;
+    line-height: 20px;
+}
+.claro .rftBlockButton .dijitButtonNode {
+    height: 24px;
+    padding: 0 4px;
+    border: none;
+    background-image: none;
+    color: #ffffff;
+    font-size: 13px;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    transition: background-color 0.3s;
+    -moz-transition: background-color 0.3s;
+    -webkit-transition: background-color 0.3s;
+    -o-transition: background-color 0.3s;
+}
+.claro .rftBlockButton .rftIcon {
+    height: 16px !important;
+    width: 16px !important;
+    background-image: url('images/icons/rftIcons16.png') !important;
+}
+.claro .rftBlockButton .rftIcon.black {
+    background-image: url('images/icons/rftIcons16b.png') !important;
+}
+.claro .rftBlockButton.rftBlockButtonHover .rftIcon {
+    background-image: url('images/icons/rftIcons16b.png') !important;
+}
+.claro .rftBlockButton.rftBlockButtonActive .rftIcon {
+    background-image: url('images/icons/rftIcons16b.png') !important;
+}
+.claro .rftBlockButton.rftBlockButtonHover .dijitButtonNode {
+    /*background: #999999 !important;*/
+    /* Currently not used, only applicable when all the different colours of BlockButton need the same background colour on hover */
+    transition: background-color 0.1s;
+    -moz-transition: background-color 0.1s;
+    -webkit-transition: background-color 0.1s;
+    -o-transition: background-color 0.1s;
+}
+
+/* Hover effects */
+/*Normal*/
+.claro span.blue.bg.rftBlockButtonHover,
+.claro .blue .inheritBgColor.rftBlockButtonHover {
+    background-color: #0794d1;
+}
+.claro span.orange.bg.rftBlockButtonHover,
+.claro .orange .inheritBgColor.rftBlockButtonHover {
+    background-color: #ff9140;
+}
+.claro span.green.bg.rftBlockButtonHover,
+.claro .green .inheritBgColor.rftBlockButtonHover {
+    background-color: #79ca0a;
+}
+.claro span.red.bg.rftBlockButtonHover,
+.claro .red .inheritBgColor.rftBlockButtonHover {
+    background-color: #bd0013;
+}
+.claro span.purple.bg.rftBlockButtonHover,
+.claro .purple .inheritBgColor.rftBlockButtonHover {
+    background-color: #993dec;
+}
+.claro span.trans.bg.rftBlockButtonHover,
+.claro .trans .inheritBgColor.rftBlockButtonHover {
+    background-color: #ffffff;
+}
+.claro span.trans.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .trans .inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #000000;
+}
+/*Light*/
+.claro span.blue.light.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .blue .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #0072bc;
+}
+.claro span.orange.light.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .orange .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #ff5b12;
+}
+.claro span.green.light.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .green .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #3aa605;
+}
+.claro span.red.light.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .red .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #8c0310;
+}
+.claro span.purple.light.bg.rftBlockButtonHover .dijitButtonNode,
+.claro .purple .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
+    color: #6529b7;
+}
+/* Set all .light .bg/.inheritBgColors hover to White background! */
+.claro span.light.bg.rftBlockButtonHover,
+.claro .light.inheritBgColor.rftBlockButtonHover {
+    background-color: #ffffff;
+}
+
+/* Active effects */
+/*Normal*/
+.claro span.blue.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .blue .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #0072bc;
+}
+.claro span.orange.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .orange .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #ff5b12;
+}
+.claro span.green.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .green .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #3aa605;
+}
+.claro span.red.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .red .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #8c0310;
+}
+.claro span.purple.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .purple .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #6529b7;
+}
+/* Set bg color to white for all normal .bg/.inheritBgColors on active! */
+.claro span.bg.rftBlockButtonActive,
+.claro .inheritBgColor.rftBlockButtonActive {
+    background-color: #ffffff;
+}
+/*Light*/
+.claro span.blue.light.bg.rftBlockButtonActive,
+.claro .blue .light.inheritBgColor.rftBlockButtonActive {
+    background-color: #0072bc;
+}
+.claro span.orange.light.bg.rftBlockButtonActive,
+.claro .orange .light.inheritBgColor.rftBlockButtonActive {
+    background-color: #ff5b12;
+}
+.claro span.green.light.bg.rftBlockButtonActive,
+.claro .green .light.inheritBgColor.rftBlockButtonActive {
+    background-color: #3aa605;
+}
+.claro span.red.light.bg.rftBlockButtonActive,
+.claro .red .light.inheritBgColor.rftBlockButtonActive {
+    background-color: #8c0310;
+}
+.claro span.purple.light.bg.rftBlockButtonActive,
+.claro .purple .light.inheritBgColor.rftBlockButtonActive {
+    background-color: #6529b7;
+}
+/* Set text color to white for all .light.bg/.light.inheritBgColor on active! */
+.claro span.light.bg.rftBlockButtonActive .dijitButtonNode,
+.claro .light.inheritBgColor.rftBlockButtonActive .dijitButtonNode {
+    color: #ffffff;
+}
+
+/****************************************************
+/*  InlineButton
+/***************************************************/
+.claro .rftInlineButton {
+    float: right;
+    height: 24px;
+    width: 24px;
+}
+.claro .rftInlineButton .dijitButtonNode {
+    width: 24px;
+    height: 24px;
+    margin: 0;
+    padding: 0;
+    background: transparent;
+    border: none;
+}
+.claro .rftInlineButton .rftIcon {
+    width: 16px;
+    height: 16px;
+    background-image: url('images/icons/rftIcons16.png');
+}
+.claro .rftInlineButton.white .rftIcon {
+    background-image: url('images/icons/rftIcons16.png');
+}
+.claro .rftInlineButton.black .rftIcon {
+    background-image: url('images/icons/rftIcons16b.png');
+}
+.claro .rftInlineButton .rftIcon.black {
+    background-image: url('images/icons/rftIcons16b.png');
+}
+.claro .rftInlineButton .rftIcon.white {
+    background-image: url('images/icons/rftIcons16.png');
+}
+.claro .rftInlineButton.rftInlineButtonHover .rftIcon {
+    /* We should use either the displacement or the background image change, not both! */
+    /*background-image: url('../../icons/images/rftIcons16c.png');*/
+    margin-top: 1px;
+}
+.claro .rftInlineButton.rftInlineButtonActive .rftIcon {
+    /* This "afterclick" is optional. Check to see if people like it or not! */
+    /* Good, the displacement on click does not come from these settings! */
+}
+
+/****************************************************
+/*  MainMenuButton
+/***************************************************/
+.claro .dijitMenuBar .rftMainMenuButton {
+    border: none;
+    height: 30px;
+    width: auto;
+    background-image: none;
+    background: transparent;
+    text-align: center;
+    color: #999999;
+    font-size: 24px;
+    line-height: 30px;
+    padding: 0 4px;
+    margin: 0 5px;
+    box-shadow: none;
+    transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+}
+.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemHover {
+    color: #ffffff;
+    font-size: 26px;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemActive {
+    color: #0794d1 !important;
+    font-size: 26px;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemSelected {
+    color: #ffffff;
+    font-size: 26px;
+}
+
+/****************************************************
+/*  IndexMenuButton
+/***************************************************/
+.claro .rftIndexMenuButton {
+    display: block;
+    margin: 0;
+    padding: 0;
+    height: 32px;
+    line-height: 32px;
+    vertical-align: middle;
+    text-align: left;
+    transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+}
+.claro .rftIndexMenuButton .dijitButtonNode {
+    border: none;
+    color: #999999;
+    font-size: 24px;
+    font-weight: normal;
+}
+.claro .rftIndexMenuButton .dijitButtonText {
+    padding-bottom: 10px;
+    line-height: 20px;
+    transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+}
+.claro .rftIndexMenuButton .dijitButtonContents {
+    vertical-align: top;
+}
+.claro .rftIndexMenuButton .rftIcon {
+    height: 32px;
+    width: 32px;
+    margin: 0 8px;
+    padding: 0;
+    background-image: url('images/icons/rftIcons32.png');
+    vertical-align: top;
+}
+.claro .oneHeight {
+    height: 100px;
+}
+.claro .oneHeight .dijitButtonNode {
+    margin: 34px 0 0 0;
+}
+.claro .twoHeight {
+    height: 200px;
+}
+.claro .twoHeight .dijitButtonNode {
+    margin: 82px 0 0 0;
+}
+.claro .fourHeight {
+    height: 400px;
+}
+.claro .fourHeight .dijitButtonNode {
+    margin: 184px 0 0 0;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover,
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover .dijitButtonText {
+    color: #ffffff;
+    transition: all 0.1s;
+    -moz-transition: all 0.1s;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover.blue {
+    background: #0072bc;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover.green {
+    background: #3aa605;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover.red {
+    background: #8c0310;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover.purple {
+    background: #6529b7;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonHover.orange {
+    background: #ff5b12;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonActive {
+    color: #000000;
+    background: #ffffff;
+    transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+}
+.claro .rftIndexMenuButton.rftIndexMenuButtonActive .rftIcon {
+    background-image: url('images/icons/rftIcons32b.png');
+}
+
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftIcons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftIcons.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftIcons.css	(revision 411)
@@ -0,0 +1,182 @@
+/*The icon's parent element class decides the icon size and url. (.rftLargeButton .rftIcon / .rftInlineButton .rftIcon, for example)*/
+/*The icon gets two classes: .rftIcon (which sets general spacing/positioning, etc), */
+/*and an icon identifier such as .rftIconAccept (Which sets the background offset.*/
+	.rftIcon {
+		display: inline-block;
+		margin: 0;
+		padding: 0;
+		border: none;
+		background-color: transparent;
+		background-repeat: no-repeat;
+	}
+	
+	/*Settings for different icon sizes and contexts */
+	.rftIcon.rftMainIcon {
+		float: left;
+		width: 32px;
+		height: 32px;
+		background-image: url('images/icons/rftIcons32.png');
+	}
+
+	/*Specific icon indices */
+	/*If extra icons are added to the spritesheets, make sure that shared icons retain the same index!*/
+	/*Also, if possible put common/shared icons at the start of the list to prevent excessively large spritesheets.*/
+
+
+	/*Types */
+	.rftIconApplication {
+		background-position: 0px 0px;
+	}
+	.rftIconDashboard {
+		background-position: -32px 0px;
+	}
+	.rftIconSession {
+		background-position: -64px 0px;
+	}
+	.rftIconSessionActive {
+		background-position: -96px 0px;
+	}
+	.rftIconSessionTemplate {
+		background-position: -128px 0px;
+	}
+	.rftIconSurvey {
+		background-position: -160px 0px;
+	}
+	.rftIconQuestion {
+		background-position: -192px 0px;
+	}
+	.rftIconQuestionFill {
+		background-position: -224px 0px;
+	}
+	.rftIconRespondent {
+		background-position: -256px 0px;
+	}
+	.rftIconAnswer {
+		background-position: -288px 0px;
+	}
+	.rftIconAnswerSet {
+		background-position: -320px 0px;
+	}
+	.rftIconGameData {
+		background-position: -352px 0px;
+	}
+	.rftIconUser {
+		background-position: -384px 0px;
+	}
+	/*Actions*/
+	.rftIconAccept {
+		background-position: -416px 0px;
+	}
+	.rftIconCancel {
+		background-position: -448px 0px;
+	}
+	.rftIconPlus {
+		background-position: -480px 0px;
+	}
+	.rftIconMinus {
+		background-position: -512px 0px;
+	}
+	.rftIconIncrease {
+		background-position: -544px 0px;
+	}
+	.rftIconDecrease {
+		background-position: -576px 0px;
+	}
+	.rftIconDelete {
+		background-position: -608px 0px;
+	}
+	.rftIconHome {
+		background-position: -640px 0px;
+	}
+	.rftIconPreview {
+		background-position: -672px 0px;
+	}
+	.rftIconSave {
+		background-position: -704px 0px;
+	}
+	.rftIconDiscard {
+		background-position: -736px 0px;
+	}
+	.rftIconProperties {
+		background-position: -768px 0px;
+	}
+	.rftIconUndo {
+		background-position: -800px 0px;
+	}
+	.rftIconRedo {
+		background-position: -832px 0px;
+	}
+	.rftIconBack {
+		background-position: -864px 0px;
+	}
+	.rftIconForward {
+		background-position: -896px 0px;
+	}
+	.rftIconRefresh {
+		background-position: -928px 0px;
+	}
+	.rftIconHelp {
+		background-position: -960px 0px;
+	}
+	.rftIconInspect {
+		background-position: -992px 0px;
+	}
+	.rftIconTag {
+		background-position: -1024px 0px;
+	}
+	.rftIconImage {
+		background-position: -1056px 0px;
+	}
+	.rftIconEdit {
+		background-position: -1088px 0px;
+	}
+	.rftIconLock {
+		background-position: -1120px 0px;
+	}
+	.rftIconUnlock {
+		background-position: -1152px 0px;
+	}
+	.rftIconPreset {
+		background-position: -1184px 0px;
+	}
+	.rftIconTextBlock {
+		background-position: -1216px 0px;
+	}
+	.rftIconPageBreak {
+		background-position: -1248px 0px;
+	}
+	.rftIconExternal {
+		background-position: -1280px 0px;
+	}
+	.rftIconInput {
+		background-position: -1312px 0px;
+	}
+	.rftIconPublish {
+		background-position: -1344px 0px;
+	}
+
+	/*Arrows */
+	.rftIconFullArrowUp {
+		background-position: -1696px 0px;
+	}
+	.rftIconFullArrowDown {
+		background-position: -1728px 0px;
+	}
+	.rftIconFullArrowLeft {
+		background-position: -1760px 0px;
+	}
+	.rftIconFullArrowRight {
+		background-position: -1792px 0px;
+	}
+	.rftIconHalfArrowUp {
+		background-position: -1824px 0px;
+	}
+	.rftIconHalfArrowDown {
+		background-position: -1856px 0px;
+	}
+	.rftIconHalfArrowLeft {
+		background-position: -1888px 0px;
+	}
+	.rftIconHalfArrowRight {
+		background-position: -1920px 0px;
+	}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftLineWithButtons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftLineWithButtons.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftLineWithButtons.css	(revision 411)
@@ -0,0 +1,92 @@
+.claro .rftLineWithActions {
+    position: relative;
+    height: 24px;
+    line-height: 24px;
+    font-size: 13px;
+    margin: 4px 0;
+    white-space: nowrap;
+}
+.claro .rftLineWithActions .rftLineWithActionsButtons {
+    position: absolute;
+    right: 0;
+    height: 24px;
+    line-height: 24px;
+    margin: 0;
+    padding: 0;
+}
+.claro .rftLineWithActions .rftLineWithActionsButtons .rftBlockButton {
+    float: right;
+    clear: none;
+}
+.claro .rftLineWithActions .rftLineWithActionsTitle {
+    float: left;
+    margin: 0 8px 0 8px;
+    overflow: hidden;
+}
+
+/* SurveyListView stuff */
+/*
+.claro div.blue.inheritBgColor.dojoDndItemAnchor,
+.claro .blue .inheritBgColor.dojoDndItemAnchor,
+.claro.blue .inheritBgColor.dojoDndItemAnchor {
+    background-color: #0794d1;
+    color: #ffffff;
+}
+.claro div.green.inheritBgColor.dojoDndItemAnchor,
+.claro .green .inheritBgColor.dojoDndItemAnchor,
+.claro.green .inheritBgColor.dojoDndItemAnchor {
+    background-color: #79ca0a;
+    color: #ffffff;
+}
+.claro div.orange.inheritBgColor.dojoDndItemAnchor,
+.claro .orange .inheritBgColor.dojoDndItemAnchor,
+.claro.orange .inheritBgColor.dojoDndItemAnchor {
+    background-color: #ff9140;
+    color: #ffffff;
+}
+.claro div.purple.inheritBgColor.dojoDndItemAnchor,
+.claro .purple .inheritBgColor.dojoDndItemAnchor,
+.claro.purple .inheritBgColor.dojoDndItemAnchor {
+    background-color: #993dec;
+    color: #ffffff;
+}
+.claro div.red.inheritBgColor.dojoDndItemAnchor,
+.claro .red .inheritBgColor.dojoDndItemAnchor,
+.claro.red .inheritBgColor.dojoDndItemAnchor {
+    background-color: #bd0013;
+    color: #ffffff;
+}*/
+
+.claro .rftLineWithActions.dojoDndItem {
+    transition: all 0.2s;
+    -moz-transition: all 0.2s;
+    -webkit-transition: all 0.2s;
+    -o-transition: all 0.2s;
+}
+.claro .rftLineWithActions.dojoDndItem.dojoDndItemBefore {
+    margin-top: 6px;
+    border-top: 6px solid #ffffff;
+}
+.claro .rftLineWithActions.dojoDndItem.dojoDndItemAfter {
+    margin-bottom: 6px;
+    border-bottom: 6px solid #ffffff;
+}
+.claro .dojoDndAvatar {
+    color: #000000;
+}
+.claro .dojoDndSourceMoved .rftLineWithActions.dojoDndItemAnchor {
+    height: 0;
+    overflow: hidden;
+}
+
+
+.claro .rftLineWithActions.dojoDndItemOver {
+    background-image: none;
+    border: none;
+    padding: 2px;
+}
+.claro .rftLineWithActions.dojoDndItemAnchor {
+    background-image: none;
+    padding: 2px;
+    border: none;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftObjectBox.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftObjectBox.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftObjectBox.css	(revision 411)
@@ -0,0 +1,15 @@
+/* rftObjectBox */
+.claro .rftObjectBox {
+    margin: 8px 0;
+}
+.claro .rftObjectBox .rftIcon.typeIcon {
+    background-image: url('images/icons/rftIcons32.png');
+    height: 32px;
+    width: 32px;
+    margin: 20px 8px;
+    float: left;
+}
+.claro .rftObjectBox .rftLineWithActions {
+    margin: 0;
+    padding: 0;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftSelector.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftSelector.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/rftSelector.css	(revision 411)
@@ -0,0 +1,34 @@
+.claro .rftSelector {
+    margin: 4px;
+    font-size: 13px;
+}
+.claro .rftSelector .rftLineWithActions {
+    margin: 0;
+}
+.claro .rftSelectorSelected .rftSelectorColor {
+    width: 8px;
+    height: 24px;
+    float: left;
+    margin: 0;
+}
+
+/* Black-on-white setting for non-header lines in the rftSelector */
+.claro .rftSelector .rftSelectorSelected .rftLineWithActions {
+    background-color: #ffffff;
+    color: #000000;
+}
+.claro .rftSelector .rftSelectorOptions .rftLineWithActions {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+/* Colour settings for the rftSelectorColor status indicator */
+.claro .rftSelectorSelected .rftSelectorColor.conflict {
+    background-color: #ff0000;
+}
+.claro .rftSelectorSelected .rftSelectorColor.pending {
+    background-color: #ff8000;
+}
+.claro .rftSelectorSelected .rftSelectorColor.success {
+    background-color: #00ff00;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/sessionEditor.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/sessionEditor.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/sessionEditor.css	(revision 411)
@@ -0,0 +1,37 @@
+.rftSessionObject {
+    width: 100px;
+    height: 100px;
+    background: #999999;
+    margin: 16px;
+    display: inline-block;
+}
+.rftSessionObject .rftIcon {
+    width: 32px;
+    height: 32px;
+    margin: 8px 34px 0 34px;
+    background-image: url('images/icons/rftIcons32.png');
+}
+.rftSessionObject label {
+    float: left;
+    clear: both;
+    width: 100px;
+    margin: 0;
+    padding: 0;
+    text-align: center;
+    color: #ffffff;
+    overflow: hidden;
+}
+
+/* Colours */
+.rftSessionObject.blue {
+    background: #0072bc;
+}
+.rftSessionObject.blue.selected {
+    background: #0794d1;
+}
+.rftSessionObject.green {
+    background: #3aa605;
+}
+.rftSessionObject.green.selected {
+    background: #79ca0a;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/backup old css/surveyEditor.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/backup old css/surveyEditor.css	(revision 411)
+++ Dev/branches/rest-dojo-ui/client/rft/css/backup old css/surveyEditor.css	(revision 411)
@@ -0,0 +1,80 @@
+.claro .surveyEditorPreview .surveyEditorPreviewItem {
+	margin: 8px;
+	display: block;
+	color: #ffffff;
+	/*padding: 0 8px;*/
+}
+
+.claro .surveyEditorPreviewItem .topBorder,
+.claro .surveyEditorPreviewItem .bottomBorder {
+	height: 24px;
+	line-height: 20px;
+}
+
+.claro .surveyEditorPreviewItem .topBorder .title {
+	margin: 0 16px 0 16px;
+	font-weight: bold;
+}
+
+.claro .surveyEditorPreviewItem .topBorderButtons {
+	float: right;
+	margin: 0;
+	padding: 0;
+}
+
+.claro .surveyEditorPreviewItemInner {
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+}
+
+.claro .surveyEditorPreviewItemContent {
+	padding: 8px;
+	border: 1px solid #ffffff;
+	border-top-width: 0;
+	color: #ffffff;
+}
+
+/* PreviewItem border colours */
+.claro div.orange .surveyEditorPreviewItemContent {
+	border-color: #ff5b12;
+}
+.claro div.blue .surveyEditorPreviewItemContent {
+	border-color: #0794d1;
+}
+.claro div.green .surveyEditorPreviewItemContent {
+	border-color: #79ca0a;
+}
+.claro div.red .surveyEditorPreviewItemContent {
+	border-color: #bd0013;
+}
+.claro div.purple .surveyEditorPreviewItemContent {
+	border-color: #993dec;
+}
+
+/* Drag and drop anchor highlighting */
+.claro .dojoDndItemAnchor, .claro .dojoDndItemOver {
+    background-color: inherit;
+}
+/*
+.claro div.blue.dojoDndItemAnchor .topBorder,
+.claro .blue .dojoDndItemAnchor .topBorder {
+	background-color: #0794d1;
+}
+.claro div.orange.dojoDndItemAnchor .topBorder,
+.claro .orange .dojoDndItemAnchor .topBorder {
+	background-color: #ff9140;
+}
+.claro div.green.dojoDndItemAnchor .topBorder,
+.claro .green .dojoDndItemAnchor .topBorder {
+	background-color: #79ca0a;
+}
+.claro div.red.dojoDndItemAnchor .topBorder,
+.claro .red .dojoDndItemAnchor .topBorder {
+	background-color: #bd0013;
+}
+.claro div.purple.dojoDndItemAnchor .topBorder,
+.claro .purple .dojoDndItemAnchor .topBorder {
+	background-color: #993dec;
+}
+*/
Index: Dev/branches/rest-dojo-ui/client/rft/css/claroOverride.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/claroOverride.css	(revision 410)
+++ 	(revision )
@@ -1,108 +1,0 @@
-/* This stylesheet compensates for the restoration of the claro style to its original specs. (21-6-2012)
- * These changes should be moved to relevant stylesheets as soon as possible!
-*/
-
-
-/* Menu.css */
-.claro .topbar .dijitMenuitem {
-    width: 90px;
-    background-image: none;
-    background-position: top;
-    text-align: center;
-}
-.claro .dijitMenuPassive .dijitMenuItemHover, .claro .dijitMenuPassive .dijitMenuItemSelected {
-    background-color: transparent;
-    color: #ffffff;
-    border: none;
-    padding: 0 4px;
-}
-.claro .dijitMenuPassive .dijitMenuItemActive {
-    background-position: top;
-}
-
-/* layout/BorderContainer.css */
-.claro .dijitSplitContainer-child, .claro .dijitBorderContainer-child {
-    border: none;
-}
-.claro .dijitTabContainerTop-dijitContentPane,
-.claro .dijitTabContainerLeft-dijitContentPane,
-.claro .dijitTabContainerBottom-dijitContentPane,
-.claro .dijitTabContainerRight-dijitContentPane,
-.claro .dijitAccordionContainer-dijitContentPane {
-    background-color: transparent;
-}
-.claro .dijitSplitContainer-dijitContentPane,
-.claro .dijitBorderContainer-dijitContentPane {
-    background-color: transparent;
-}
-
-/* layout/TabContainer.css */
-.claro .dijitTabPaneWrapper {
-    background: transparent;
-}
-.claro .dijitTabInnerDiv {
-    background-color: transparent;
-    color: #999999;
-    border: none;
-}
-.claro .dijitTabContent {
-    border: none;
-}
-.claro .dijitTabHover .dijitTabInnerDiv {
-    background-color: transparent;
-    color: #ffffff;
-}
-.claro .dijitTabActive .dijitTabInnerDiv {
-    color: #0072bc;
-}
-.claro .dijitTabChecked .dijitTabInnerDiv {
-    background-color: transparent;
-    color: #ffffff;
-}
-.claro .dijitTabContent {
-    border: 1px solid #999999;
-}
-.claro .dijitTabHover .dijitTabContent {
-    border-color: #ffffff;
-}
-.claro .dijitTabActive .dijitTabContent {
-    border-color: transparent;
-}
-.claro .dijitTabChecked .dijitTabContent {
-    color: #ffffff;
-    border-color: #0072bc;
-}
-/*lefttabs*/
-.claro .dijitTabContainerLeft-tabs .dijitTab {
-    border-width: 1px;
-    left: 0;
-    margin-bottom: 4px;
-    margin-right: 8px;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv {
-    border: none;
-    background: transparent;
-    background-image: none;
-    background-position: top;
-    background-repeat: no-repeat;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTabContent {
-    padding: 3px 8px 4px 8px;
-    background-image: none;
-
-}
-.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabContent {
-    padding-right: 8px;
-    background-image: none;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv {
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv,
-.claro .dijitTabContainerLeft-tabs .dijitTabContent {
-    -moz-border-radius: 0;
-    border-radius: 0;
-    border: none;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/general.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/general.css	(revision 410)
+++ 	(revision )
@@ -1,6 +1,0 @@
-/* General.css contains general fixes that are not strongly related to any other stylesheets.
-They are typically small fixes or tweaks to adjust spacing and/or borders/colours */
-
-.claro .dijitTabPaneWrapper {
-    border: none;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/layout.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/layout.css	(revision 410)
+++ 	(revision )
@@ -1,607 +1,0 @@
-*:focus {
-    /* Disabled Chrome focus outlines! */
-    outline: none;
-}
-html,body {
-    width: 100%;
-    height: 100%;
-    font-size: 13px;
-    background-color: #333333;
-}
-.claro {
-    font-family: 'Segoe UI', Verdana, Arial, Helvetica, sans-serif;
-    color: #000000;
-}
-
-/* Headings */
-.claro h1 {   
-    float: left;
-    clear: left;
-    font-size: 48px;
-    color: #999999;
-    margin: 0 10px 8px 10px;
-    padding: 0;
-    line-height: 48px;
-    font-weight: normal !important;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-}
-.claro h2 {
-    /* Content pane title */
-    color: #ffffff;
-    font-size: 22px;
-    line-height: 30px;
-    margin: 0;
-    padding: 0;
-}
-.claro h2 .rftIcon {
-    float: left;
-    width: 32px;
-    height: 32px;
-    background-image: url('images/icons/rftIcons32.png');
-    margin-right: 8px;
-}
-.claro h3 {
-    /* Section headers */
-    font-size: 18px;
-    margin: 0 0 4px 0;
-}
-.claro h4 {
-    /* Small text headers/paragraph headers */
-    font-size: 16px;
-}
-
-/* Topbar  */
-.claro .topbar {
-    overflow-y: hidden;
-}
-.claro .topbar .dijitMenuBar {
-    border: none;
-    background-color: transparent;
-    background-image: none;    
-    float: right;
-    clear: right;
-    margin-top: 16px;
-}
-
-/* Breadcrumbs */
-.claro .breadcrumbs {
-    float: left;
-    clear: left;
-    width: 100%;
-    text-align: center;
-    height: 16px;
-    line-height: 16px;
-    margin: 0 0 4px 0;
-}
-.claro .breadcrumbs .breadcrumb {
-    color: #999999;
-    font-size: 13px;
-}
-.claro .breadcrumbs .breadcrumb.breadcrumbCurrent {
-    color: #ffffff;
-    font-size: 14px;
-}
-.claro .breadcrumbs .breadcrumb.breadcrumbHover {
-    color: #0072bc;
-}
-
-/* Content */
-.claro .dijitContentPane.page {
-    padding: 0;
-}
-.claro .content.dijitContentPane {
-    display: block;
-    clear: both;
-    padding: 0;
-    background-color: #555555;
-    /* Background gradient time! */
-    background: -webkit-radial-gradient(
-        50% 50%, 
-        circle, 
-        #666666 1%,
-        #444444 100%
-        );
-    background: -moz-radial-gradient(
-        50% 50%, 
-        circle, 
-        #666666 1%,
-        #444444 100%
-        );
-}
-.claro .content.dijitContentPane .dijitBorderContainer {
-    padding: 2px;
-}
-
-
-
-
-
-
-
-
-
-
-/* General */
-.loginLabel {
-    float: left;
-    clear: left;
-    width: 100px;
-}
-.loginInput {
-    float: left;
-    clear: right;
-    width: 150px;
-}
-.rftMultipleChoiceWidget {
-    display: table;
-}
-.rftMultipleChoiceWidget .row {
-    display: table-row;
-}
-.rftMultipleChoiceWidget .rowBox {
-    display: table-cell;
-}
-.rftMultipleChoiceWidget .rowText {
-    display: table-cell;
-    width: 100px;
-}
-.rftMultipleChoiceWidget .rowBtn {
-    display: table-cell;
-    width: 30px;
-}
-.verticalTabList {
-    width: 190px;
-}
-
-/* Tabs */
-.claro .dijitTabContainerLeft-tabs {
-    border: none;
-    padding: 4px 16px 4px 4px;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTab {
-    margin: 4px 0;
-    width: 200px;
-    min-height: 30px;
-    border: 1px solid #888888;
-}
-.claro .dijitTab {
-    background-color: transparent;
-    padding: 2px 8px;
-    color: #999999;
-    white-space: normal;
-    overflow: hidden;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -o-transition: all 0.3s;
-}
-.claro .dijitTabContainerLeft-tabs .dijitTab .dijitTabContent {
-    height: 48px;
-    line-height: 24px;
-    width: 190px;
-}
-.claro .dijitTab.dijitTabHover {
-    color: #ffffff;
-    border-color: #ffffff;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .dijitTab.dijitTabActive {
-    color: #0072bc;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .dijitTab.dijitTabChecked {
-    color: #ffffff;
-    border: 1px solid transparent;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .dijitTabContainer.blue .dijitTab.dijitTabChecked {
-    background-color: #0072bc;
-}
-.claro .dijitTabContainer.orange .dijitTab.dijitTabChecked {
-    background-color: #ff5b12;
-}
-.claro .dijitTabContainer.red .dijitTab.dijitTabChecked {
-    background-color: #8c0310;
-}
-.claro .dijitTabContainer.purple .dijitTab.dijitTabChecked {
-    background-color: #6529b7;
-}
-.claro .dijitTabContainer.green .dijitTab.dijitTabChecked {
-    background-color: #3aa605;
-}
-.claro .dijitTabContainer.blue .dijitTab.dijitTabActive {
-    color: #0072bc;
-}
-.claro .dijitTabContainer.orange .dijitTab.dijitTabActive {
-    color: #ff5b12;
-}
-.claro .dijitTabContainer.red .dijitTab.dijitTabActive {
-    color: #8c0310;
-}
-.claro .dijitTabContainer.purple .dijitTab.dijitTabActive {
-    color: #6529b7;
-}
-.claro .dijitTabContainer.green .dijitTab.dijitTabActive {
-    color: #3aa605;
-}
-
-/* Index Menu */
-.claro .rftIndexMenuBlock {
-    width: 400px;
-    height: 400px;
-    background: #444444;
-    float: left;
-    margin: 16px;
-    overflow: hidden;
-}
-.claro .rftIndexMenuMask {
-    height: 400px;
-    width: 400px;
-    background: #444444;
-    color: #999999;
-    margin-top: 0;
-}
-.claro .rftIndexMenuBlock:hover .rftIndexMenuMask {
-    margin-top: -400px;
-}
-.claro .rftIndexMenuMask .label {
-    color: #999999;
-    font-size: 32px;
-    line-height: 28px;
-    height: 32px;
-    margin: 184px 0;
-    float: left;
-}
-.claro .rftIndexMenuMask .rftIcon {
-    width: 32px;
-    height: 32px;
-    background-image: url('images/icons/rftIcons32.png');
-    margin: 184px 8px 0 8px;
-    float: left;
-}
-
-
-/* Inputs */
-fieldset {
-    border: none;
-}
-fieldset.align input,
-fieldset.align .dijitTextBox,
-fieldset.align textarea {
-    margin-left: 0;
-}
-fieldset.align label {
-    color: #ffffff;
-    display: inline-block;
-    width: 100px !important;
-}
-
-.claro .newline {
-    display: block;
-}
-
-/* Question editor/Survey Advanced editor */
-.claro .QuestionEditor .PreviewWindow {
-    /* Nothing yet, put preview window styling options here after we've decided on a format to follow! */
-}
-.claro .dijitAccordionContainer {
-    /* No styling for now, use this for margins and other layout-related business. This class does not affect the look of the AccordionContainer currently! */
-}
-.claro .dijitAccordionInnerContainer {
-    /* This contains a title and a childWrapper. The two of these make up one "item" in the Accordion element */
-    border: none;
-    border-color: #333333;
-    background-color: #0072bc;
-    margin-bottom: 0;
-}
-.claro .dijitAccordionInnerContainer {
-    background-color: transparent;
-}
-.claro .dijitAccordionTitle, .claro .dijitAccordionTitleSelected {
-    background-color: #0072bc;
-    background-image: none;
-    color: #ffffff;
-}
-.claro .dijitAccordionTitle .rftIcon {
-    width: 16px;
-    height: 16px;
-    background-image: url('images/icons/rftIcons16b.png');
-    margin: 0 4px 2px 0;
-}
-.claro .dijitAccordionTitleSelected .rftIcon {
-    background-image: url('images/icons/rftIcons16.png');
-}
-.claro .dijitAccordionContainer.blue .dijitAccordionTitle, .claro .dijitAccordionContainer.blue .dijitAccordionTitleSelected {
-    background-color: #0072bc;
-}
-.claro .dijitAccordionContainer.blue .dijitAccordionTitleHover {
-    background-color: #0794d1;
-}
-.claro .dijitAccordionContainer.orange .dijitAccordionTitle, .claro .dijitAccordionContainer.orange .dijitAccordionTitleSelected {
-    background-color: #ff5b12;
-}
-.claro .dijitAccordionContainer.orange .dijitAccordionTitleHover {
-    background-color: #ff9140;
-}
-.claro .dijitAccordionText {
-    color: #ffffff;
-}
-.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
-    background-color: #444444;
-    border: none !important;
-    padding: 0;
-    margin: 0;
-}
-.claro .dijitAccordionContainer .dijitAccordionInnerContainerSelectedHover .dijitAccordionChildWrapper,
-.claro .dijitAccordionContainer .dijitAccordionInnerContainerSelectedActive .dijitAccordionChildWrapper {
-    border: none;
-    box-shadow: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    /* Override the box shadow and offset on hover */
-}
-
-/* DojoX.TitleGroup, replacement of AccordionContainer in Question Editor */
-.claro .dojoxTitleGroup {
-    /* No styling yet */
-}
-.claro .dojoxTitleGroup .dijitTitlePane {
-    margin: 0;
-}
-.claro .orange .dojoxTitleGroup .dijitTitlePaneTitle {
-    background-color: #ff5b12;
-    background-image: none;
-    border: none;
-    padding: 0 4px;
-    height: 24px;
-    margin: 0;
-}
-.claro .orange .dojoxTitleGroup .dijitTitlePaneTitleHover, 
-.claro .orange .dojoxTitleGroup .dijitTitlePanelTitleFocused {
-    background-color: #ff9140;
-}
-.claro .dojoxTitleGroup .dijitTitlePaneTextNode {
-    color: #ffffff;
-    font-size: 13px;
-    line-height: 24px;
-}
-.claro .dojoxTitleGroup .dijitTitlePaneContentOuter {
-    background-color: #444;
-    border: none;
-}
-.claro .dojoxTitleGroup .dijitTitlePaneTitleFocus {
-    margin: 0;
-}
-
-/****************************************************
-/*  Self- and Inherit Colours
-/***************************************************/
-
-/* InheritColours */
-.claro .inheritBgColor,
-.claro .bg {
-    transition: all 0.2s;
-    -moz-transition: all 0.2s;
-    -webkit-transition: all 0.2s;
-}
-.claro .blue .inheritBgColor {
-    background-color: #0072bc;
-    color: #ffffff;
-}
-.claro .blue.light .inheritBgColor,
-.claro .blue .light.inheritBgColor {
-    background-color: #0794d1;
-    color: #ffffff;
-}
-.claro .green .inheritBgColor {
-    background-color: #3aa605;
-    color: #ffffff;
-}
-.claro .green.light .inheritBgColor,
-.claro .green .light.inheritBgColor {
-    background-color: #79ca0a;
-    color: #ffffff;
-}
-.claro .orange .inheritBgColor {
-    background-color: #ff5b12;
-    color: #ffffff;
-}
-.claro .orange.light .inheritBgColor,
-.claro .orange .light.inheritBgColor {
-    background-color: #ff9140;
-    color: #ffffff;
-}
-.claro .red .inheritBgColor {
-    background-color: #8c0310;
-    color: #ffffff;
-}
-.claro .red.light .inheritBgColor,
-.claro .red .light.inheritBgColor {
- background-color: #bd0013;
- color: #ffffff;   
-}
-.claro .purple .inheritBgColor {
-    background-color: #6529b7;
-    color: #ffffff;
-}
-.claro .purple.light .inheritBgColor,
-.claro .purple .light.inheritBgColor {
-    background-color: #993dec;
-    color: #ffffff;
-}
-.claro .white .inheritBgColor {
-    background-color: #ffffff;
-    color: #000000;
-}
-.claro .black .inheritBgColor {
-    background-color: #000000;
-    color: #ffffff;
-}
-.claro .trans .inheritBgColor,
-.claro .trans.bg {
-    background: transparent;
-    color: #ffffff;
-}
-
-/*SelfColours! */
-.claro .blue.bg {
-    background-color: #0072bc;
-    color: #ffffff;
-}
-.claro .blue.light.bg {
-    background-color: #0794d1;
-    color: #ffffff;
-}
-.claro .green.bg {
-    background-color: #3aa605;
-    color: #ffffff;
-}
-.claro .green.light.bg {
-    background-color: #79ca0a;
-    color: #ffffff;
-}
-.claro .orange.bg {
-    background-color: #ff5b12;
-    color: #ffffff;
-}
-.claro .orange.light.bg {
-    background-color: #ff9140;
-    color: #ffffff;
-}
-.claro .red.bg {
-    background-color: #8c0310;
-    color: #ffffff;
-}
-.claro .red.light.bg {
-    background-color: #bd0013;
-    color: #ffffff;   
-}
-.claro .purple.bg {
-    background-color: #6529b7;
-    color: #ffffff;
-}
-.claro .purple.light.bg {
-    background-color: #993dec;
-    color: #ffffff;
-}
-.claro .white.bg {
-    background-color: #ffffff;
-    color: #000000;
-}
-.claro .black.bg {
-    background-color: #000000;
-    color: #ffffff;
-}
-.claro .trans.bg {
-    background: transparent;
-    color: #ffffff;
-}
-
-/*************************************/
-/*  Dropdown menu on MenuBar
-/*************************************/
-.claro .dijitMenuPopup {
-
-}
-.claro .dijitMenuPopup .dijitMenu {
-    border: none;
-    background-color: #333333;
-    background-image: none;
-    color: #999999;   
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItem {
-    color: #999999;
-    background-image: none;
-    background-color: transparent;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.blue,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.blue {
-    background-color: #0072bc;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.orange,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.orange {
-    background-color: #ff5b12;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.purple,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.purple {
-    background-color: #6529b7;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.green,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.green {
-    background-color: #3aa605;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover.red,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected.red {
-    background-color: #8c0310;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemHover .dijitMenuItemLabel,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemActive .dijitMenuItemLabel,
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemSelected .dijitMenuItemLabel {
-    color: #ffffff;
-}
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItem .rftIcon {
-    height: 16px;
-    width: 16px;
-    margin: 0;
-    margin-right: 4px;
-    background-image: url('images/icons/rftIcons16.png');
-} 
-.claro .dijitMenuPopup .dijitMenu .dijitMenuItemActive .rftIcon {
-    background-image: url('images/icons/rftIcons16b.png');
-}
-
-
-/* Alignment */
-.claro .floatRight {
-    float: right;
-    margin: 0;
-    padding: 0;
-}
-
-
-/* SurveyListView */
-.claro .rftSurveyListView {
-}
-.claro .rftSurveyListView .rftSurveyListViewContent {
-    height: 300px;
-    background: #444444;
-    overflow: auto;
-}
-.claro .rftSurveyListView .rftLineWithButtons .rftLineWithButtonsTitle {
-    max-width: 200px;
-    overflow: hidden;
-}
-
-/* AccountListView */
-.claro .rftAccountListView .rftLineWithButtons .rftLineWithButtonsTitle {
-    max-width: 400px;
-    overflow: auto;
-}
-/* Generic list with lines */
-.claro .rftLineListView {
-    max-width: 200px;
-    max-height: 500px;
-}
-.claro .rftLineListView .rftLineListViewContent {
-    max-width: 200px;
-    overflow: auto;
-}
-
-
-/* Two column tables */
-.labelsAndValues-labelCell {
-  padding-left: 5px;
-}
-.labelsAndValues-valueCell {
-  padding-left: 20px;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/main.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/main.css	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/css/main.css	(revision 411)
@@ -1,13 +1,1281 @@
-@import url('external.css');
-@import url('claroOverride.css');
+/* Menu.css */
+@import "external.css";
+DESCRIPTION {
+  /*
+How to use colour system:
+Apply a combination of at most 1 "colour" class and one or more "modifier" classes.
+Colour classes: Red, Blue, Green, Orange, Purple
+Modifer classes:
+- textColor: Change the font colour of element to the "colour" class combined with.
+- bgColor: Change the background colour to the "colour" class combined with.
+- doesHover: If present in combination with one of the above two modifiers, 
+the element will shift it's background- or text colour to a lighter version on hover.
+- hoverTextColor: Same as .textColor, but only affects elements being hovered over.
+- hoverBgColor: Same as .bgColor, but only affects elements being hovered over.
+NOTE: .doesHover does nothing in combination with the above two modifiers!
+*/
 
-@import url('layout.css');
-@import url('general.css');
-
-@import url('rftLineWithButtons.css');
-@import url('rftButtons.css');
-@import url('rftIcons.css');
-@import url('rftSelector.css');
-@import url('rftObjectBox.css');
-@import url('sessionEditor.css');
-@import url('surveyEditor.css');
+}
+#rft.claro .blue.textColor {
+  color: #0072bc;
+}
+#rft.claro .blue.textColor.doesHover:hover {
+  color: #0794d1;
+}
+#rft.claro .blue.bgColor {
+  background-color: #0072bc;
+  color: #ffffff;
+}
+#rft.claro .blue.bgColor.doesHover:hover {
+  background-color: #0794d1;
+  color: #111111;
+}
+#rft.claro .blue.hoverTextColor:hover {
+  color: #0072bc;
+}
+#rft.claro .blue.hoverBgColor:hover {
+  background-color: #0072bc;
+}
+#rft.claro .red.textColor {
+  color: #8c0310;
+}
+#rft.claro .red.textColor.doesHover:hover {
+  color: #bd0013;
+}
+#rft.claro .red.bgColor {
+  background-color: #8c0310;
+  color: #ffffff;
+}
+#rft.claro .red.bgColor.doesHover:hover {
+  background-color: #bd0013;
+  color: #111111;
+}
+#rft.claro .red.hoverTextColor:hover {
+  color: #8c0310;
+}
+#rft.claro .red.hoverBgColor:hover {
+  background-color: #8c0310;
+}
+#rft.claro .orange.textColor {
+  color: #ff5b12;
+}
+#rft.claro .orange.textColor.doesHover:hover {
+  color: #ff9140;
+}
+#rft.claro .orange.bgColor {
+  background-color: #ff5b12;
+  color: #ffffff;
+}
+#rft.claro .orange.bgColor.doesHover:hover {
+  background-color: #ff9140;
+  color: #111111;
+}
+#rft.claro .orange.hoverTextColor:hover {
+  color: #ff5b12;
+}
+#rft.claro .orange.hoverBgColor:hover {
+  background-color: #ff5b12;
+}
+#rft.claro .green.textColor {
+  color: #3aa605;
+}
+#rft.claro .green.textColor.doesHover:hover {
+  color: #79ca0a;
+}
+#rft.claro .green.bgColor {
+  background-color: #3aa605;
+  color: #ffffff;
+}
+#rft.claro .green.bgColor.doesHover:hover {
+  background-color: #79ca0a;
+  color: #111111;
+}
+#rft.claro .green.hoverTextColor:hover {
+  color: #3aa605;
+}
+#rft.claro .green.hoverBgColor:hover {
+  background-color: #3aa605;
+}
+#rft.claro .purple.textColor {
+  color: #6529b7;
+}
+#rft.claro .purple.textColor.doesHover:hover {
+  color: #993dec;
+}
+#rft.claro .purple.bgColor {
+  background-color: #6529b7;
+  color: #ffffff;
+}
+#rft.claro .purple.bgColor.doesHover:hover {
+  background-color: #993dec;
+  color: #111111;
+}
+#rft.claro .purple.hoverTextColor:hover {
+  color: #6529b7;
+}
+#rft.claro .purple.hoverBgColor:hover {
+  background-color: #6529b7;
+}
+#rft.claro .textColor,
+#rft.claro .hoverTextColor {
+  transition: color 0.2s;
+}
+#rft.claro .bgColor,
+#rft.claro .hoverBgColor {
+  transition: background-color 0.2s;
+}
+/* This stylesheet compensates for the restoration of the claro style to its original specs. (21-6-2012)
+ * These changes should be moved to relevant stylesheets as soon as possible!
+*/
+/* Menu.css */
+.claro .topbar .dijitMenuitem {
+  width: 90px;
+  background-image: none;
+  background-position: top;
+  text-align: center;
+}
+.claro .dijitMenuPassive .dijitMenuItemHover,
+.claro .dijitMenuPassive .dijitMenuItemSelected {
+  background-color: transparent;
+  color: #ffffff;
+  border: none;
+  padding: 0 4px;
+}
+.claro .dijitMenuPassive .dijitMenuItemActive {
+  background-position: top;
+}
+/* layout/BorderContainer.css */
+.claro .dijitSplitContainer-child,
+.claro .dijitBorderContainer-child {
+  border: none;
+}
+.claro .dijitTabContainerTop-dijitContentPane,
+.claro .dijitTabContainerLeft-dijitContentPane,
+.claro .dijitTabContainerBottom-dijitContentPane,
+.claro .dijitTabContainerRight-dijitContentPane,
+.claro .dijitAccordionContainer-dijitContentPane {
+  background-color: transparent;
+}
+.claro .dijitSplitContainer-dijitContentPane,
+.claro .dijitBorderContainer-dijitContentPane {
+  background-color: transparent;
+}
+/* layout/TabContainer.css */
+.claro .dijitTabPaneWrapper {
+  background: transparent;
+}
+.claro .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #999999;
+  border: none;
+}
+.claro .dijitTabContent {
+  border: none;
+}
+.claro .dijitTabHover .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabInnerDiv {
+  color: #0072bc;
+}
+.claro .dijitTabChecked .dijitTabInnerDiv {
+  background-color: transparent;
+  color: #ffffff;
+}
+.claro .dijitTabContent {
+  border: 1px solid #999999;
+}
+.claro .dijitTabHover .dijitTabContent {
+  border-color: #ffffff;
+}
+.claro .dijitTabActive .dijitTabContent {
+  border-color: transparent;
+}
+.claro .dijitTabChecked .dijitTabContent {
+  color: #ffffff;
+  border-color: #0072bc;
+}
+/*lefttabs*/
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+  border-width: 1px;
+  left: 0;
+  margin-bottom: 4px;
+  margin-right: 8px;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv {
+  border: none;
+  background: transparent;
+  background-image: none;
+  background-position: top;
+  background-repeat: no-repeat;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+  padding: 3px 8px 4px 8px;
+  background-image: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabContent {
+  padding-right: 8px;
+  background-image: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv,
+.claro .dijitTabContainerLeft-tabs .dijitTabContent {
+  -moz-border-radius: 0;
+  border-radius: 0;
+  border: none;
+}
+*:focus {
+  outline: none;
+}
+html,
+body {
+  width: 100%;
+  height: 100%;
+  background-color: #333333;
+}
+#rft.claro {
+  font-family: 'Segoe UI', Helvetica, Verdana, Arial, sans-serif;
+  font-size: 13px;
+  color: #111111;
+}
+#rft.claro .dijitBorderContainer,
+#rft.claro .dijitContentPane,
+#rft.claro .dijitTabContainer,
+#rft.claro .dijitTabPaneWrapper {
+  background: transparent;
+  border: none;
+}
+#rft.claro h1 {
+  margin: 0 0 0 0;
+  padding: 0 10px 8px 10px;
+  float: left;
+  clear: left;
+  font-size: 48px;
+  color: #999999;
+  line-height: 48px;
+  font-weight: normal;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+#rft.claro h2 {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  color: #999999;
+  font-size: 22px;
+  line-height: 30px;
+}
+#rft.claro h2 .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+  margin-right: 8px;
+}
+#rft.claro h3 {
+  margin: 0 0 0 0;
+  font-size: 18px;
+  margin-bottom: 4px;
+}
+#rft.claro h4 {
+  font-size: 16px;
+}
+#rft.claro .topbar {
+  overflow-y: hidden;
+}
+#rft.claro .topbar .dijitMenuBar {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  background-color: transparent;
+  float: right;
+  clear: right;
+  margin-top: 16px;
+}
+#rft.claro .topbar .breadcrumbs {
+  color: #999999;
+}
+#rft.claro .topbar .breadcrumbs .breadcrumb {
+  font-size: 13px;
+}
+#rft.claro .topbar .breadcrumbs .breadcrumb.breadcrumbCurrent {
+  color: #ffffff;
+  font-size: 15px;
+}
+#rft.claro .topbar .breadcrumbs .breadcrumb.breadcrumbHover {
+  color: #0072bc;
+}
+#rft.claro .dijitContentPane.page {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}
+#rft.claro .dijitContentPane.content {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  display: block;
+  clear: both;
+  background-color: #555555;
+  background-image: -webkit-gradient(50% 50%, circle, #666666 1%, #444444 100%);
+  -moz-background-image: gradient(50% 50%, circle, #666666 1%, #444444 100%);
+  -o-background-image: gradient(50% 50%, circle, #666666 1%, #444444 100%);
+  -ms-background-image: gradient(50% 50%, circle, #666666 1%, #444444 100%);
+  background-image: gradient(50% 50%, circle, #666666 1%, #444444 100%);
+}
+#rft.claro .dijitContentPane.content .dijitBorderContainer {
+  padding: 4px;
+}
+#rft.claro .loginLabel {
+  float: left;
+  clear: left;
+  width: 100px;
+}
+#rft.claro .loginInput {
+  width: 150px;
+}
+#rft.claro .rftMultipleChoiceWidget {
+  display: table;
+}
+#rft.claro .rftMultipleChoiceWidget .row {
+  display: table-row;
+}
+#rft.claro .rftMultipleChoiceWidget .rowBox {
+  display: table-cell;
+}
+#rft.claro .rftMultipleChoiceWidget .rowText {
+  display: table-cell;
+  width: 100px;
+}
+#rft.claro .rftMultipleChoiceWidget .rowBtn {
+  display: table-cell;
+  width: 30px;
+}
+#rft.claro .verticalTabList {
+  width: 190px;
+}
+#rft.claro .dijitTab {
+  -webkit-transition: all 0.2s;
+  -moz-transition: all 0.2s;
+  -o-transition: all 0.2s;
+  -ms-transition: all 0.2s;
+  transition: all 0.2s;
+  background-color: transparent;
+  padding: 4px 8px;
+  color: #999999;
+  overflow: hidden;
+}
+#rft.claro .dijitTabContainerLeft-tabs {
+  border: none;
+  padding: 4px;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab {
+  margin: 4px;
+  width: 200px;
+  min-height: 30px;
+  border: 1px solid #999999;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab .dijitTabContent {
+  min-height: 30px;
+  line-height: 30px;
+  width: 190px;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabChecked {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+  color: #ffffff;
+  border: 1px solid transparent;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabChecked.dijitTabHover {
+  border: 1px solid transparent;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabHover {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+  color: #ffffff;
+  border-color: #ffffff;
+}
+#rft.claro .dijitTabContainerLeft-tabs .dijitTab.dijitTabActive {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+  color: #999999;
+}
+#rft.claro.blue .dijitTabChecked,
+#rft.claro .blue .dijitTabChecked,
+#rft.claro div.blue.dijitTabChecked {
+  background-color: #0072bc;
+}
+#rft.claro.green .dijitTabChecked,
+#rft.claro .green .dijitTabChecked,
+#rft.claro div.green.dijitTabChecked {
+  background-color: #3aa605;
+}
+#rft.claro.red .dijitTabChecked,
+#rft.claro .red .dijitTabChecked,
+#rft.claro div.red.dijitTabChecked {
+  background-color: #8c0310;
+}
+#rft.claro.orange .dijitTabChecked,
+#rft.claro .orange .dijitTabChecked,
+#rft.claro div.orange.dijitTabChecked {
+  background-color: #ff5b12;
+}
+#rft.claro.purple .dijitTabChecked,
+#rft.claro .purple .dijitTabChecked,
+#rft.claro div.purple.dijitTabChecked {
+  background-color: #6529b7;
+}
+#rft.claro fieldset {
+  border: none;
+}
+#rft.claro fieldset.align input,
+#rft.claro fieldset.align .dijitTextBox,
+#rft.claro fieldset.align textarea {
+  margin-left: 0;
+}
+#rft.claro fieldset.align label {
+  color: #ffffff;
+  display: inline-block;
+  width: 100px !important;
+}
+#rft.claro .newline {
+  float: left;
+  clear: left;
+  display: block;
+}
+#rft.claro .floatRight {
+  float: right;
+  margin: 0 0 0 0;
+}
+#rft.claro .rftLineListView {
+  max-width: 200px;
+  max-height: 500px;
+}
+#rft.claro .rftLineListView .rftLineListViewContent {
+  width: auto;
+  overflow: auto;
+}
+#rft.claro .rftIcon {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  float: left;
+  display: inline-block;
+  border: none;
+  background-color: transparent;
+  background-repeat: no-repeat;
+}
+#rft .rftIconApplication {
+  background-position: 0px 0px;
+}
+#rft .rftIconDashboard {
+  background-position: -32px 0px;
+}
+#rft .rftIconSession {
+  background-position: -64px 0px;
+}
+#rft .rftIconSessionActive {
+  background-position: -96px 0px;
+}
+#rft .rftIconSessionTemplate {
+  background-position: -128px 0px;
+}
+#rft .rftIconSurvey {
+  background-position: -160px 0px;
+}
+#rft .rftIconQuestion {
+  background-position: -192px 0px;
+}
+#rft .rftIconQuestionFill {
+  background-position: -224px 0px;
+}
+#rft .rftIconRespondent {
+  background-position: -256px 0px;
+}
+#rft .rftIconAnswer {
+  background-position: -288px 0px;
+}
+#rft .rftIconAnswerSet {
+  background-position: -320px 0px;
+}
+#rft .rftIconGameData {
+  background-position: -352px 0px;
+}
+#rft .rftIconUser {
+  background-position: -384px 0px;
+}
+#rft .rftIconAccept {
+  background-position: -416px 0px;
+}
+#rft .rftIconCancel {
+  background-position: -448px 0px;
+}
+#rft .rftIconPlus {
+  background-position: -480px 0px;
+}
+#rft .rftIconMinus {
+  background-position: -512px 0px;
+}
+#rft .rftIconIncrease {
+  background-position: -544px 0px;
+}
+#rft .rftIconDecrease {
+  background-position: -576px 0px;
+}
+#rft .rftIconDelete {
+  background-position: -608px 0px;
+}
+#rft .rftIconHome {
+  background-position: -640px 0px;
+}
+#rft .rftIconPreview {
+  background-position: -672px 0px;
+}
+#rft .rftIconSave {
+  background-position: -704px 0px;
+}
+#rft .rftIconDiscard {
+  background-position: -736px 0px;
+}
+#rft .rftIconProperties {
+  background-position: -768px 0px;
+}
+#rft .rftIconUndo {
+  background-position: -800px 0px;
+}
+#rft .rftIconRedo {
+  background-position: -832px 0px;
+}
+#rft .rftIconBack {
+  background-position: -864px 0px;
+}
+#rft .rftIconForward {
+  background-position: -896px 0px;
+}
+#rft .rftIconRefresh {
+  background-position: -928px 0px;
+}
+#rft .rftIconHelp {
+  background-position: -960px 0px;
+}
+#rft .rftIconInspect {
+  background-position: -992px 0px;
+}
+#rft .rftIconTag {
+  background-position: -1024px 0px;
+}
+#rft .rftIconImage {
+  background-position: -1056px 0px;
+}
+#rft .rftIconEdit {
+  background-position: -1088px 0px;
+}
+#rft .rftIconLock {
+  background-position: -1120px 0px;
+}
+#rft .rftIconUnlock {
+  background-position: -1152px 0px;
+}
+#rft .rftIconPreset {
+  background-position: -1184px 0px;
+}
+#rft .rftIconTextBlock {
+  background-position: -1216px 0px;
+}
+#rft .rftIconPageBreak {
+  background-position: -1248px 0px;
+}
+#rft .rftIconExternal {
+  background-position: -1280px 0px;
+}
+#rft .rftIconInput {
+  background-position: -1312px 0px;
+}
+#rft .rftIconPublish {
+  background-position: -1344px 0px;
+}
+#rft .rftIconFullArrowUp {
+  background-position: -1696px 0px;
+}
+#rft .rftIconFullArrowDown {
+  background-position: -1728px 0px;
+}
+#rft .rftIconFullArrowLeft {
+  background-position: -1760px 0px;
+}
+#rft .rftIconFullArrowRight {
+  background-position: -1792px 0px;
+}
+#rft .rftIconHalfArrowUp {
+  background-position: -1824px 0px;
+}
+#rft .rftIconHalfArrowDown {
+  background-position: -1856px 0px;
+}
+#rft .rftIconHalfArrowLeft {
+  background-position: -1888px 0px;
+}
+#rft .rftIconHalfArrowRight {
+  background-position: -1920px 0px;
+}
+#rft.claro .rftSelector {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  margin: 4px;
+}
+#rft.claro .rftSelector .rftLineWithActions {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  float: left;
+  width: 8px;
+  height: 24px;
+  background-color: #bedead;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.conflict {
+  background-color: #ff0000;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.pending {
+  background-color: #ff8000;
+}
+#rft.claro .rftSelector .rftSelectorSelected .rftSelectorIndicator.success {
+  background-color: #00ff00;
+}
+#rft.claro .rftSelector .rftSelectorOptions .rftLineWithActions,
+#rft.claro .rftSelector .rftSelectorSelected .rftLineWithActions {
+  background-color: #ffffff;
+  color: #111111;
+}
+#rft.claro .rftLineWithActions {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  position: relative;
+  height: 24px;
+  white-space: nowrap;
+  margin: 4px 0;
+  color: #ffffff;
+}
+#rft.claro .rftLineWithActions.dojoDndItem {
+  -webkit-transition: all 0.2s;
+  -moz-transition: all 0.2s;
+  -o-transition: all 0.2s;
+  -ms-transition: all 0.2s;
+  transition: all 0.2s;
+}
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemBefore {
+  margin-top: 6px;
+  border-top: 6px solid #ffffff;
+}
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemAfter {
+  margin-bottom: 6px;
+  border-bottom: 6px solid #ffffff;
+}
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemover,
+#rft.claro .rftLineWithActions.dojoDndItem.dojoDndItemAnchor {
+  background-image: none;
+  border: none;
+  padding: 2px;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+#rft.claro .rftLineWithActions .rftLineWithActionsTitle {
+  float: left;
+  margin: 0 8px;
+  overflow: hidden;
+  white-space: nowrap;
+  word-wrap: break-word;
+}
+#rft.claro .rftLineWithActions .rftLineWithActionsButtons {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  line-height: 24px;
+  height: 24px;
+  position: absolute;
+  right: 0;
+  float: left;
+}
+#rft.claro .dojoDndSourceMoved .rftLineWithActions.dojoDndItemAnchor {
+  height: 0;
+}
+#rft.claro .rftIndexMenuBlock {
+  width: 400px;
+  height: 400px;
+  background: #444444;
+  float: left;
+  margin: 16px;
+  overflow: hidden;
+}
+#rft.claro .rftIndexMenuBlock:hover .rftIndexMenuMask {
+  margin-top: -400px;
+}
+#rft.claro .rftIndexMenuMask {
+  width: 400px;
+  height: 400px;
+  background: #444444;
+  color: #999999;
+  margin-top: 0;
+}
+#rft.claro .rftIndexMenuMask .label {
+  color: #999999;
+  font-size: 32px;
+  height: 32px;
+  line-height: 32px;
+  margin-top: 184px;
+  float: left;
+}
+#rft.claro .rftIndexMenuMask .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+  float: left;
+  margin: 184px 8px 0 8px;
+}
+#rft.claro .rftIndexMenuButton {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  transition: all 0.3s;
+  line-height: 32px;
+  border: none;
+}
+#rft.claro .rftIndexMenuButton .dijitButtonNode {
+  border: none;
+  color: #999999;
+  font-size: 22px;
+}
+#rft.claro .rftIndexMenuButton .dijitButtonNode .dijitButtonContents {
+  vertical-align: top;
+}
+#rft.claro .rftIndexMenuButton .dijitButtonNode .dijitButtonContents .dijitButtonText {
+  padding-bottom: 10px;
+  line-height: 20px;
+}
+#rft.claro .rftIndexMenuButton .dijitButtonNode .dijitButtonContents .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+  margin: 0 8px;
+}
+#rft.claro .rftIndexMenuButton.oneHeight {
+  height: 100px;
+  width: 400px;
+}
+#rft.claro .rftIndexMenuButton.oneHeight .dijitButtonNode {
+  margin: 38px 0 0 0;
+}
+#rft.claro .rftIndexMenuButton.twoHeight {
+  height: 200px;
+  width: 400px;
+}
+#rft.claro .rftIndexMenuButton.twoHeight .dijitButtonNode {
+  margin: 88px 0 0 0;
+}
+#rft.claro .rftIndexMenuButton.fourHeight {
+  height: 400px;
+  width: 400px;
+}
+#rft.claro .rftIndexMenuButton.fourHeight .dijitButtonNode {
+  margin: 188px 0 0 0;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover {
+  color: #ffffff;
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover .dijitButtonText {
+  color: #ffffff;
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover.blue {
+  background-color: #0072bc;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover.red {
+  background-color: #8c0310;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover.green {
+  background-color: #3aa605;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover.orange {
+  background-color: #ff5b12;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonHover.purple {
+  background-color: #6529b7;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonActive {
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  transition: all 0.3s;
+  color: #111111;
+  background: #ffffff;
+}
+#rft.claro .rftIndexMenuButton.rftIndexMenuButtonActive .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32b.png');
+}
+#rft.claro .dijitMenuPopup .dijitMenu {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  color: #999999;
+  background-color: #333333;
+  border: none;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem {
+  color: #999999;
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  background-color: #333333;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover .dijitMenuItemLabel,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive .dijitMenuItemLabel,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected .dijitMenuItemLabel {
+  color: #ffffff;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.red,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.red,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.red {
+  background-color: #8c0310;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.blue,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.blue,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.blue {
+  background-color: #0072bc;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.green,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.green,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.green {
+  background-color: #3aa605;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.orange,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.orange,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.orange {
+  background-color: #ff5b12;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemHover.purple,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive.purple,
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemSelected.purple {
+  background-color: #6529b7;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16.png');
+  margin: 0 0 0 0;
+  margin-right: 8px;
+}
+#rft.claro .dijitMenuPopup .dijitMenu .dijitMenuItem.dijitMenuItemActive .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16b.png');
+}
+#rft.claro .dijitMenuBar .rftMainMenuButton {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+  border: none;
+  height: 30px;
+  width: auto;
+  background: transparent;
+  color: #999999;
+  text-align: center;
+  font-size: 24px;
+  line-height: 30px;
+  padding: 0 4px;
+  margin: 0 5px;
+}
+#rft.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemHover,
+#rft.claro .dijitMenuBar .rftMainMenuButton.dijitMenuitemActive {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+}
+#rft.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemHover {
+  color: #ffffff;
+  font-size: 26px;
+}
+#rft.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemActive {
+  color: #0072bc;
+  font-size: 26px;
+}
+#rft.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemSelected {
+  font-size: 26px;
+  color: #ffffff;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane {
+  margin: 0 0 0 0;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitle {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin: 0 0 0 0;
+  background-color: #ff5b12;
+  border: none;
+  padding: 0 4px;
+  height: 24px;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitle.dijitTitlePaneTitleHover,
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitle.dijitTitlePaneTitleFocused {
+  background-color: #ff9140;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTextNode {
+  color: #ffffff;
+  font-size: 13px;
+  line-height: 24px;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneContentOuter {
+  background-color: #444444;
+  border: none;
+}
+#rft.claro .dojoxTitleGroup .dijitTitlePane .dijitTitlePaneTitleFocus {
+  margin: 0 0 0 0;
+}
+#rft.claro .rftSurveyListView .rftSurveyListViewContent {
+  min-height: 300px;
+  background: #444444;
+  overflow: auto;
+}
+#rft.claro .rftLargeButton {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-right: 16px;
+  height: 24px;
+}
+#rft.claro .rftLargeButton*,
+#rft.claro .rftLargeButton * {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+#rft.claro .rftLargeButton .dijitButtonNode {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  border: none;
+  height: 24px;
+  background: transparent;
+  color: #999999;
+  font-size: 20px;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  transition: all 0.3s;
+}
+#rft.claro .rftLargeButton .dijitButtonNode .rftIcon {
+  width: 24px;
+  height: 24px;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons24.png');
+}
+#rft.claro .rftLargeButton .dijitButtonNode .dijitButtonText {
+  line-height: 24px;
+  margin: 0 0 0 0;
+  padding-left: 8px;
+}
+#rft.claro .rftLargeButton.black .dijitButtonNode .rftIcon {
+  width: 24px;
+  height: 24px;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons24b.png');
+}
+#rft.claro .rftLargeButton.rftLargeButtonHover .dijitButtonNode,
+#rft.claro .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+}
+#rft.claro span.blue.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+#rft.claro .blue .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  color: #0794d1;
+}
+#rft.claro span.orange.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+#rft.claro .orange .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  color: #ff9140;
+}
+#rft.claro span.green.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+#rft.claro .green .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  color: #79ca0a;
+}
+#rft.claro span.red.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+#rft.claro .red .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  color: #bd0013;
+}
+#rft.claro span.purple.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
+#rft.claro .purple .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
+  color: #993dec;
+}
+#rft.claro .rftBlockButton {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin: 0 0 0 0;
+  height: 24px;
+  line-height: 24px;
+  vertical-align: top;
+}
+#rft.claro .rftBlockButton .dijitButtonNode {
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  transition: all 0.3s;
+  line-height: 24px;
+  vertical-align: top;
+  height: 24px;
+  padding: 0 4px;
+  border: none;
+  color: #ffffff;
+  font-size: 13px;
+}
+#rft.claro .rftBlockButton .dijitButtonNode .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16.png');
+}
+#rft.claro .rftBlockButton.rftBlockButtonHover,
+#rft.claro .rftBlockButton.rftBlockButtonActive {
+  -webkit-transition: all 0.1s;
+  -moz-transition: all 0.1s;
+  -o-transition: all 0.1s;
+  -ms-transition: all 0.1s;
+  transition: all 0.1s;
+}
+#rft.claro .rftBlockButton.rftBlockButtonHover .rftIcon,
+#rft.claro .rftBlockButton.rftBlockButtonActive .rftIcon {
+  vertical-align: top;
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16b.png');
+}
+#rft.claro .rftInlineButton {
+  float: right;
+  height: 24px;
+  width: 24px;
+}
+#rft.claro .rftInlineButton .dijitButtonNode {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  border: none;
+  background-image: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  width: 24px;
+  height: 24px;
+  border: none;
+}
+#rft.claro .rftInlineButton .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16.png');
+}
+#rft.claro .rftInlineButton.white .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16.png');
+}
+#rft.claro .rftInlineButton.black .rftIcon {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16b.png');
+}
+#rft.claro .rftInlineButton.rftInlineButtonHover.white {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16b.png');
+}
+#rft.claro .rftInlineButton.rftInlineButtonHover.black {
+  width: 16px;
+  height: 16px;
+  margin: 4px 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons16b.png');
+}
+#rft.claro .rftObjectBox {
+  margin: 8px 0;
+}
+#rft.claro .rftObjectBox .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+  float: left;
+  margin: 20px 8px;
+}
+#rft.claro .rftObjectBox .rftLineWithActions {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+}
+#rft.claro .rftSessionObject {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  width: 100px;
+  height: 100px;
+  background: #999999;
+  margin: 8px;
+  display: inline-block;
+}
+#rft.claro .rftSessionObject .rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+  margin: 8px 34px 0 34px;
+}
+#rft.claro .rftSessionObject label {
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  float: left;
+  clear: both;
+  width: 100px;
+  text-align: center;
+  color: #ffffff;
+  overflow: hidden;
+}
+#rft.claro .rftSessionObject.blue {
+  background-color: #0072bc;
+}
+#rft.claro .rftSessionObject.blue.selected {
+  background-color: #0794d1;
+}
+#rft.claro .rftSessionObject.green {
+  background-color: #3aa605;
+}
+#rft.claro .rftSessionObject.green.selected {
+  background-color: #79ca0a;
+}
+#rft.claro .rftSessionObject.red {
+  background-color: #8c0310;
+}
+#rft.claro .rftSessionObject.red.selected {
+  background-color: #bd0013;
+}
+#rft.claro .rftObjectBox {
+  padding: 0 0 0 0;
+  color: #ffffff;
+}
+#rft.claro .rftObjectBox .typeIcon.rftIcon {
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0 0 0 0;
+  background-image: url('images/icons/rftIcons32.png');
+}
+#rft.claro .rftObjectBox .rftLineWithActions {
+  background-color: #3aa605;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorCategory .rftLineWithActions {
+  background-color: #ff5b12;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftLineWithActions {
+  background-color: #ffffff;
+  color: #111111;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton {
+  background-color: #ff00ff;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton .dijitButtonNode {
+  background-color: #ff5b12;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton.dijitHover .dijitButtonNode {
+  background-color: #ffffff;
+}
+#rft.claro .page_questions .rftSelector .rftSelectorSelected .rftBlockButton.dijitActive .dijitButtonNode {
+  background-color: #ff9140;
+}
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftButtons.css	(revision 410)
+++ 	(revision )
@@ -1,408 +1,0 @@
-/****************************************************
-/*  LargeButton
-/***************************************************/
-.claro .rftLargeButton, 
-.claro .rftLargeButton * {
-    user-select: none;
-    -webkit-user-select: none;
-}
-.claro .rftLargeButton {
-    margin-right: 16px;
-    height: 30px;
-}
-.claro .rftLargeButton .dijitButtonNode {
-    border: none;
-    height: 24px;
-    background-image: none;
-    background: transparent;
-    color: #999999;
-    font-size: 20px;
-    box-shadow: none;
-    transition: color 0.3s;
-    -moz-transition: color 0.3s;
-    -webkit-transition: color 0.3s;
-    -o-transition: color 0.3s;
-}
-.claro .rftLargeButton .rftIcon {
-    width: 24px;
-    height: 24px;
-    background-image: url('images/icons/rftIcons24.png');
-}
-.claro .rftLargeButton.black .rftIcon {
-    background-image: url('images/icons/rftIcons24b.png');
-}
-.claro .rftLargeButton .dijitButtonText {
-    line-height: 24px;
-    margin-left: 6px;
-    padding: 0;
-}
-.claro .rftLargeButton.rftLargeButtonHover .dijitButtonNode {
-    transition: color 0.1s;
-    -moz-transition: color 0.1s;
-    -webkit-transition: color 0.1s;
-    -o-transition: color 0.1s;
-    color: #ffffff;
-}
-.claro .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    transition: color 0.1s;
-    -moz-transition: color 0.1s;
-    -webkit-transition: color 0.1s;
-    -o-transition: color 0.1s;
-}
-.claro span.blue.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
-.claro .blue .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    color: #0794d1;
-}
-.claro span.orange.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
-.claro .orange .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    color: #ff9140;
-}
-.claro span.green.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
-.claro .green .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    color: #79ca0a;
-}
-.claro span.red.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
-.claro .red .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    color: #bd0013;
-}
-.claro span.purple.rftLargeButton.rftLargeButtonActive .dijitButtonNode,
-.claro .purple .rftLargeButton.rftLargeButtonActive .dijitButtonNode {
-    color: #993dec;
-}
-
-/****************************************************
-/*  BlockButton
-/***************************************************/
-
-.claro .rftBlockButton {
-    height: 24px;
-    margin: 0;
-    line-height: 20px;
-}
-.claro .rftBlockButton .dijitButtonNode {
-    height: 24px;
-    padding: 0 4px;
-    border: none;
-    background-image: none;
-    color: #ffffff;
-    font-size: 13px;
-    border-radius: 0;
-    -moz-border-radius: 0;
-    transition: background-color 0.3s;
-    -moz-transition: background-color 0.3s;
-    -webkit-transition: background-color 0.3s;
-    -o-transition: background-color 0.3s;
-}
-.claro .rftBlockButton .rftIcon {
-    height: 16px !important;
-    width: 16px !important;
-    background-image: url('images/icons/rftIcons16.png') !important;
-}
-.claro .rftBlockButton .rftIcon.black {
-    background-image: url('images/icons/rftIcons16b.png') !important;
-}
-.claro .rftBlockButton.rftBlockButtonHover .rftIcon {
-    background-image: url('images/icons/rftIcons16b.png') !important;
-}
-.claro .rftBlockButton.rftBlockButtonActive .rftIcon {
-    background-image: url('images/icons/rftIcons16b.png') !important;
-}
-.claro .rftBlockButton.rftBlockButtonHover .dijitButtonNode {
-    /*background: #999999 !important;*/
-    /* Currently not used, only applicable when all the different colours of BlockButton need the same background colour on hover */
-    transition: background-color 0.1s;
-    -moz-transition: background-color 0.1s;
-    -webkit-transition: background-color 0.1s;
-    -o-transition: background-color 0.1s;
-}
-
-/* Hover effects */
-/*Normal*/
-.claro span.blue.bg.rftBlockButtonHover,
-.claro .blue .inheritBgColor.rftBlockButtonHover {
-    background-color: #0794d1;
-}
-.claro span.orange.bg.rftBlockButtonHover,
-.claro .orange .inheritBgColor.rftBlockButtonHover {
-    background-color: #ff9140;
-}
-.claro span.green.bg.rftBlockButtonHover,
-.claro .green .inheritBgColor.rftBlockButtonHover {
-    background-color: #79ca0a;
-}
-.claro span.red.bg.rftBlockButtonHover,
-.claro .red .inheritBgColor.rftBlockButtonHover {
-    background-color: #bd0013;
-}
-.claro span.purple.bg.rftBlockButtonHover,
-.claro .purple .inheritBgColor.rftBlockButtonHover {
-    background-color: #993dec;
-}
-.claro span.trans.bg.rftBlockButtonHover,
-.claro .trans .inheritBgColor.rftBlockButtonHover {
-    background-color: #ffffff;
-}
-.claro span.trans.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .trans .inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #000000;
-}
-/*Light*/
-.claro span.blue.light.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .blue .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #0072bc;
-}
-.claro span.orange.light.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .orange .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #ff5b12;
-}
-.claro span.green.light.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .green .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #3aa605;
-}
-.claro span.red.light.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .red .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #8c0310;
-}
-.claro span.purple.light.bg.rftBlockButtonHover .dijitButtonNode,
-.claro .purple .light.inheritBgColor.rftBlockButtonHover .dijitButtonNode {
-    color: #6529b7;
-}
-/* Set all .light .bg/.inheritBgColors hover to White background! */
-.claro span.light.bg.rftBlockButtonHover,
-.claro .light.inheritBgColor.rftBlockButtonHover {
-    background-color: #ffffff;
-}
-
-/* Active effects */
-/*Normal*/
-.claro span.blue.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .blue .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #0072bc;
-}
-.claro span.orange.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .orange .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #ff5b12;
-}
-.claro span.green.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .green .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #3aa605;
-}
-.claro span.red.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .red .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #8c0310;
-}
-.claro span.purple.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .purple .inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #6529b7;
-}
-/* Set bg color to white for all normal .bg/.inheritBgColors on active! */
-.claro span.bg.rftBlockButtonActive,
-.claro .inheritBgColor.rftBlockButtonActive {
-    background-color: #ffffff;
-}
-/*Light*/
-.claro span.blue.light.bg.rftBlockButtonActive,
-.claro .blue .light.inheritBgColor.rftBlockButtonActive {
-    background-color: #0072bc;
-}
-.claro span.orange.light.bg.rftBlockButtonActive,
-.claro .orange .light.inheritBgColor.rftBlockButtonActive {
-    background-color: #ff5b12;
-}
-.claro span.green.light.bg.rftBlockButtonActive,
-.claro .green .light.inheritBgColor.rftBlockButtonActive {
-    background-color: #3aa605;
-}
-.claro span.red.light.bg.rftBlockButtonActive,
-.claro .red .light.inheritBgColor.rftBlockButtonActive {
-    background-color: #8c0310;
-}
-.claro span.purple.light.bg.rftBlockButtonActive,
-.claro .purple .light.inheritBgColor.rftBlockButtonActive {
-    background-color: #6529b7;
-}
-/* Set text color to white for all .light.bg/.light.inheritBgColor on active! */
-.claro span.light.bg.rftBlockButtonActive .dijitButtonNode,
-.claro .light.inheritBgColor.rftBlockButtonActive .dijitButtonNode {
-    color: #ffffff;
-}
-
-/****************************************************
-/*  InlineButton
-/***************************************************/
-.claro .rftInlineButton {
-    float: right;
-    height: 24px;
-    width: 24px;
-}
-.claro .rftInlineButton .dijitButtonNode {
-    width: 24px;
-    height: 24px;
-    margin: 0;
-    padding: 0;
-    background: transparent;
-    border: none;
-}
-.claro .rftInlineButton .rftIcon {
-    width: 16px;
-    height: 16px;
-    background-image: url('images/icons/rftIcons16.png');
-}
-.claro .rftInlineButton.white .rftIcon {
-    background-image: url('images/icons/rftIcons16.png');
-}
-.claro .rftInlineButton.black .rftIcon {
-    background-image: url('images/icons/rftIcons16b.png');
-}
-.claro .rftInlineButton .rftIcon.black {
-    background-image: url('images/icons/rftIcons16b.png');
-}
-.claro .rftInlineButton .rftIcon.white {
-    background-image: url('images/icons/rftIcons16.png');
-}
-.claro .rftInlineButton.rftInlineButtonHover .rftIcon {
-    /* We should use either the displacement or the background image change, not both! */
-    /*background-image: url('../../icons/images/rftIcons16c.png');*/
-    margin-top: 1px;
-}
-.claro .rftInlineButton.rftInlineButtonActive .rftIcon {
-    /* This "afterclick" is optional. Check to see if people like it or not! */
-    /* Good, the displacement on click does not come from these settings! */
-}
-
-/****************************************************
-/*  MainMenuButton
-/***************************************************/
-.claro .dijitMenuBar .rftMainMenuButton {
-    border: none;
-    height: 30px;
-    width: auto;
-    background-image: none;
-    background: transparent;
-    text-align: center;
-    color: #999999;
-    font-size: 24px;
-    line-height: 30px;
-    padding: 0 4px;
-    margin: 0 5px;
-    box-shadow: none;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -o-transition: all 0.3s;
-}
-.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemHover {
-    color: #ffffff;
-    font-size: 26px;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemActive {
-    color: #0794d1 !important;
-    font-size: 26px;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .dijitMenuBar .rftMainMenuButton.dijitMenuItemSelected {
-    color: #ffffff;
-    font-size: 26px;
-}
-
-/****************************************************
-/*  IndexMenuButton
-/***************************************************/
-.claro .rftIndexMenuButton {
-    display: block;
-    margin: 0;
-    padding: 0;
-    height: 32px;
-    line-height: 32px;
-    vertical-align: middle;
-    text-align: left;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -o-transition: all 0.3s;
-}
-.claro .rftIndexMenuButton .dijitButtonNode {
-    border: none;
-    color: #999999;
-    font-size: 24px;
-    font-weight: normal;
-}
-.claro .rftIndexMenuButton .dijitButtonText {
-    padding-bottom: 10px;
-    line-height: 20px;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -o-transition: all 0.3s;
-}
-.claro .rftIndexMenuButton .dijitButtonContents {
-    vertical-align: top;
-}
-.claro .rftIndexMenuButton .rftIcon {
-    height: 32px;
-    width: 32px;
-    margin: 0 8px;
-    padding: 0;
-    background-image: url('images/icons/rftIcons32.png');
-    vertical-align: top;
-}
-.claro .oneHeight {
-    height: 100px;
-}
-.claro .oneHeight .dijitButtonNode {
-    margin: 34px 0 0 0;
-}
-.claro .twoHeight {
-    height: 200px;
-}
-.claro .twoHeight .dijitButtonNode {
-    margin: 82px 0 0 0;
-}
-.claro .fourHeight {
-    height: 400px;
-}
-.claro .fourHeight .dijitButtonNode {
-    margin: 184px 0 0 0;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover,
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover .dijitButtonText {
-    color: #ffffff;
-    transition: all 0.1s;
-    -moz-transition: all 0.1s;
-    -webkit-transition: all 0.1s;
-    -o-transition: all 0.1s;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover.blue {
-    background: #0072bc;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover.green {
-    background: #3aa605;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover.red {
-    background: #8c0310;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover.purple {
-    background: #6529b7;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonHover.orange {
-    background: #ff5b12;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonActive {
-    color: #000000;
-    background: #ffffff;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -o-transition: all 0.3s;
-}
-.claro .rftIndexMenuButton.rftIndexMenuButtonActive .rftIcon {
-    background-image: url('images/icons/rftIcons32b.png');
-}
-
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftIcons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftIcons.css	(revision 410)
+++ 	(revision )
@@ -1,182 +1,0 @@
-/*The icon's parent element class decides the icon size and url. (.rftLargeButton .rftIcon / .rftInlineButton .rftIcon, for example)*/
-/*The icon gets two classes: .rftIcon (which sets general spacing/positioning, etc), */
-/*and an icon identifier such as .rftIconAccept (Which sets the background offset.*/
-	.rftIcon {
-		display: inline-block;
-		margin: 0;
-		padding: 0;
-		border: none;
-		background-color: transparent;
-		background-repeat: no-repeat;
-	}
-	
-	/*Settings for different icon sizes and contexts */
-	.rftIcon.rftMainIcon {
-		float: left;
-		width: 32px;
-		height: 32px;
-		background-image: url('images/icons/rftIcons32.png');
-	}
-
-	/*Specific icon indices */
-	/*If extra icons are added to the spritesheets, make sure that shared icons retain the same index!*/
-	/*Also, if possible put common/shared icons at the start of the list to prevent excessively large spritesheets.*/
-
-
-	/*Types */
-	.rftIconApplication {
-		background-position: 0px 0px;
-	}
-	.rftIconDashboard {
-		background-position: -32px 0px;
-	}
-	.rftIconSession {
-		background-position: -64px 0px;
-	}
-	.rftIconSessionActive {
-		background-position: -96px 0px;
-	}
-	.rftIconSessionTemplate {
-		background-position: -128px 0px;
-	}
-	.rftIconSurvey {
-		background-position: -160px 0px;
-	}
-	.rftIconQuestion {
-		background-position: -192px 0px;
-	}
-	.rftIconQuestionFill {
-		background-position: -224px 0px;
-	}
-	.rftIconRespondent {
-		background-position: -256px 0px;
-	}
-	.rftIconAnswer {
-		background-position: -288px 0px;
-	}
-	.rftIconAnswerSet {
-		background-position: -320px 0px;
-	}
-	.rftIconGameData {
-		background-position: -352px 0px;
-	}
-	.rftIconUser {
-		background-position: -384px 0px;
-	}
-	/*Actions*/
-	.rftIconAccept {
-		background-position: -416px 0px;
-	}
-	.rftIconCancel {
-		background-position: -448px 0px;
-	}
-	.rftIconPlus {
-		background-position: -480px 0px;
-	}
-	.rftIconMinus {
-		background-position: -512px 0px;
-	}
-	.rftIconIncrease {
-		background-position: -544px 0px;
-	}
-	.rftIconDecrease {
-		background-position: -576px 0px;
-	}
-	.rftIconDelete {
-		background-position: -608px 0px;
-	}
-	.rftIconHome {
-		background-position: -640px 0px;
-	}
-	.rftIconPreview {
-		background-position: -672px 0px;
-	}
-	.rftIconSave {
-		background-position: -704px 0px;
-	}
-	.rftIconDiscard {
-		background-position: -736px 0px;
-	}
-	.rftIconProperties {
-		background-position: -768px 0px;
-	}
-	.rftIconUndo {
-		background-position: -800px 0px;
-	}
-	.rftIconRedo {
-		background-position: -832px 0px;
-	}
-	.rftIconBack {
-		background-position: -864px 0px;
-	}
-	.rftIconForward {
-		background-position: -896px 0px;
-	}
-	.rftIconRefresh {
-		background-position: -928px 0px;
-	}
-	.rftIconHelp {
-		background-position: -960px 0px;
-	}
-	.rftIconInspect {
-		background-position: -992px 0px;
-	}
-	.rftIconTag {
-		background-position: -1024px 0px;
-	}
-	.rftIconImage {
-		background-position: -1056px 0px;
-	}
-	.rftIconEdit {
-		background-position: -1088px 0px;
-	}
-	.rftIconLock {
-		background-position: -1120px 0px;
-	}
-	.rftIconUnlock {
-		background-position: -1152px 0px;
-	}
-	.rftIconPreset {
-		background-position: -1184px 0px;
-	}
-	.rftIconTextBlock {
-		background-position: -1216px 0px;
-	}
-	.rftIconPageBreak {
-		background-position: -1248px 0px;
-	}
-	.rftIconExternal {
-		background-position: -1280px 0px;
-	}
-	.rftIconInput {
-		background-position: -1312px 0px;
-	}
-	.rftIconPublish {
-		background-position: -1344px 0px;
-	}
-
-	/*Arrows */
-	.rftIconFullArrowUp {
-		background-position: -1696px 0px;
-	}
-	.rftIconFullArrowDown {
-		background-position: -1728px 0px;
-	}
-	.rftIconFullArrowLeft {
-		background-position: -1760px 0px;
-	}
-	.rftIconFullArrowRight {
-		background-position: -1792px 0px;
-	}
-	.rftIconHalfArrowUp {
-		background-position: -1824px 0px;
-	}
-	.rftIconHalfArrowDown {
-		background-position: -1856px 0px;
-	}
-	.rftIconHalfArrowLeft {
-		background-position: -1888px 0px;
-	}
-	.rftIconHalfArrowRight {
-		background-position: -1920px 0px;
-	}
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftLineWithButtons.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftLineWithButtons.css	(revision 410)
+++ 	(revision )
@@ -1,92 +1,0 @@
-.claro .rftLineWithButtons {
-    position: relative;
-    height: 24px;
-    line-height: 24px;
-    font-size: 13px;
-    margin: 4px 0;
-    white-space: nowrap;
-}
-.claro .rftLineWithButtons .rftLineWithButtonsButtons {
-    position: absolute;
-    right: 0;
-    height: 24px;
-    line-height: 24px;
-    margin: 0;
-    padding: 0;
-}
-.claro .rftLineWithButtons .rftLineWithButtonsButtons .rftBlockButton {
-    float: right;
-    clear: none;
-}
-.claro .rftLineWithButtons .rftLineWithButtonsTitle {
-    float: left;
-    margin: 0 8px 0 8px;
-    overflow: hidden;
-}
-
-/* SurveyListView stuff */
-/*
-.claro div.blue.inheritBgColor.dojoDndItemAnchor,
-.claro .blue .inheritBgColor.dojoDndItemAnchor,
-.claro.blue .inheritBgColor.dojoDndItemAnchor {
-    background-color: #0794d1;
-    color: #ffffff;
-}
-.claro div.green.inheritBgColor.dojoDndItemAnchor,
-.claro .green .inheritBgColor.dojoDndItemAnchor,
-.claro.green .inheritBgColor.dojoDndItemAnchor {
-    background-color: #79ca0a;
-    color: #ffffff;
-}
-.claro div.orange.inheritBgColor.dojoDndItemAnchor,
-.claro .orange .inheritBgColor.dojoDndItemAnchor,
-.claro.orange .inheritBgColor.dojoDndItemAnchor {
-    background-color: #ff9140;
-    color: #ffffff;
-}
-.claro div.purple.inheritBgColor.dojoDndItemAnchor,
-.claro .purple .inheritBgColor.dojoDndItemAnchor,
-.claro.purple .inheritBgColor.dojoDndItemAnchor {
-    background-color: #993dec;
-    color: #ffffff;
-}
-.claro div.red.inheritBgColor.dojoDndItemAnchor,
-.claro .red .inheritBgColor.dojoDndItemAnchor,
-.claro.red .inheritBgColor.dojoDndItemAnchor {
-    background-color: #bd0013;
-    color: #ffffff;
-}*/
-
-.claro .rftLineWithButtons.dojoDndItem {
-    transition: all 0.2s;
-    -moz-transition: all 0.2s;
-    -webkit-transition: all 0.2s;
-    -o-transition: all 0.2s;
-}
-.claro .rftLineWithButtons.dojoDndItem.dojoDndItemBefore {
-    margin-top: 6px;
-    border-top: 6px solid #ffffff;
-}
-.claro .rftLineWithButtons.dojoDndItem.dojoDndItemAfter {
-    margin-bottom: 6px;
-    border-bottom: 6px solid #ffffff;
-}
-.claro .dojoDndAvatar {
-    color: #000000;
-}
-.claro .dojoDndSourceMoved .rftLineWithButtons.dojoDndItemAnchor {
-    height: 0;
-    overflow: hidden;
-}
-
-
-.claro .rftLineWithButtons.dojoDndItemOver {
-    background-image: none;
-    border: none;
-    padding: 2px;
-}
-.claro .rftLineWithButtons.dojoDndItemAnchor {
-    background-image: none;
-    padding: 2px;
-    border: none;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftObjectBox.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftObjectBox.css	(revision 410)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* rftObjectBox */
-.claro .rftObjectBox {
-    margin: 8px 0;
-}
-.claro .rftObjectBox .rftIcon.typeIcon {
-    background-image: url('images/icons/rftIcons32.png');
-    height: 32px;
-    width: 32px;
-    margin: 20px 8px;
-    float: left;
-}
-.claro .rftObjectBox .rftLineWithButtons {
-    margin: 0;
-    padding: 0;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/rftSelector.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/rftSelector.css	(revision 410)
+++ 	(revision )
@@ -1,34 +1,0 @@
-.claro .rftSelector {
-    margin: 4px;
-    font-size: 13px;
-}
-.claro .rftSelector .rftLineWithButtons {
-    margin: 0;
-}
-.claro .rftSelectorSelected .rftSelectorColor {
-    width: 8px;
-    height: 24px;
-    float: left;
-    margin: 0;
-}
-
-/* Black-on-white setting for non-header lines in the rftSelector */
-.claro .rftSelector .rftSelectorSelected .rftLineWithButtons {
-    background-color: #ffffff;
-    color: #000000;
-}
-.claro .rftSelector .rftSelectorOptions .rftLineWithButtons {
-    background-color: #ffffff;
-    color: #000000;
-}
-
-/* Colour settings for the rftSelectorColor status indicator */
-.claro .rftSelectorSelected .rftSelectorColor.conflict {
-    background-color: #ff0000;
-}
-.claro .rftSelectorSelected .rftSelectorColor.pending {
-    background-color: #ff8000;
-}
-.claro .rftSelectorSelected .rftSelectorColor.success {
-    background-color: #00ff00;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/sessionEditor.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/sessionEditor.css	(revision 410)
+++ 	(revision )
@@ -1,37 +1,0 @@
-.rftSessionObject {
-    width: 100px;
-    height: 100px;
-    background: #999999;
-    margin: 16px;
-    display: inline-block;
-}
-.rftSessionObject .rftIcon {
-    width: 32px;
-    height: 32px;
-    margin: 8px 34px 0 34px;
-    background-image: url('images/icons/rftIcons32.png');
-}
-.rftSessionObject label {
-    float: left;
-    clear: both;
-    width: 100px;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-    color: #ffffff;
-    overflow: hidden;
-}
-
-/* Colours */
-.rftSessionObject.blue {
-    background: #0072bc;
-}
-.rftSessionObject.blue.selected {
-    background: #0794d1;
-}
-.rftSessionObject.green {
-    background: #3aa605;
-}
-.rftSessionObject.green.selected {
-    background: #79ca0a;
-}
Index: Dev/branches/rest-dojo-ui/client/rft/css/surveyEditor.css
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/css/surveyEditor.css	(revision 410)
+++ 	(revision )
@@ -1,80 +1,0 @@
-.claro .surveyEditorPreview .surveyEditorPreviewItem {
-	margin: 8px;
-	display: block;
-	color: #ffffff;
-	/*padding: 0 8px;*/
-}
-
-.claro .surveyEditorPreviewItem .topBorder,
-.claro .surveyEditorPreviewItem .bottomBorder {
-	height: 24px;
-	line-height: 20px;
-}
-
-.claro .surveyEditorPreviewItem .topBorder .title {
-	margin: 0 16px 0 16px;
-	font-weight: bold;
-}
-
-.claro .surveyEditorPreviewItem .topBorderButtons {
-	float: right;
-	margin: 0;
-	padding: 0;
-}
-
-.claro .surveyEditorPreviewItemInner {
-	margin: 0;
-	padding: 0;
-	overflow: hidden;
-}
-
-.claro .surveyEditorPreviewItemContent {
-	padding: 8px;
-	border: 1px solid #ffffff;
-	border-top-width: 0;
-	color: #ffffff;
-}
-
-/* PreviewItem border colours */
-.claro div.orange .surveyEditorPreviewItemContent {
-	border-color: #ff5b12;
-}
-.claro div.blue .surveyEditorPreviewItemContent {
-	border-color: #0794d1;
-}
-.claro div.green .surveyEditorPreviewItemContent {
-	border-color: #79ca0a;
-}
-.claro div.red .surveyEditorPreviewItemContent {
-	border-color: #bd0013;
-}
-.claro div.purple .surveyEditorPreviewItemContent {
-	border-color: #993dec;
-}
-
-/* Drag and drop anchor highlighting */
-.claro .dojoDndItemAnchor, .claro .dojoDndItemOver {
-    background-color: inherit;
-}
-/*
-.claro div.blue.dojoDndItemAnchor .topBorder,
-.claro .blue .dojoDndItemAnchor .topBorder {
-	background-color: #0794d1;
-}
-.claro div.orange.dojoDndItemAnchor .topBorder,
-.claro .orange .dojoDndItemAnchor .topBorder {
-	background-color: #ff9140;
-}
-.claro div.green.dojoDndItemAnchor .topBorder,
-.claro .green .dojoDndItemAnchor .topBorder {
-	background-color: #79ca0a;
-}
-.claro div.red.dojoDndItemAnchor .topBorder,
-.claro .red .dojoDndItemAnchor .topBorder {
-	background-color: #bd0013;
-}
-.claro div.purple.dojoDndItemAnchor .topBorder,
-.claro .purple .dojoDndItemAnchor .topBorder {
-	background-color: #993dec;
-}
-*/
Index: Dev/branches/rest-dojo-ui/client/rft/pages/questions.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/pages/questions.html	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/pages/questions.html	(revision 411)
@@ -1,3 +1,3 @@
-<div class="blue">
+<div class="blue page_questions">
 
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
Index: Dev/branches/rest-dojo-ui/client/rft/pages/questions.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/pages/questions.js	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/pages/questions.js	(revision 411)
@@ -18,5 +18,5 @@
             this.questionBrowser = new TabbedQuestionBrowser({
                 region: 'center',
-                'class': 'blue',
+                'class': 'orange',
                 itemActions: {
                     Edit: {
Index: Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidget.js
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidget.js	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidget.js	(revision 411)
@@ -13,5 +13,5 @@
     return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
         templateString: templateString,
-        baseClass: 'rftLineWithButtons',
+        baseClass: 'rftLineWithActions',
         title: '',
         selectable: false,
@@ -27,5 +27,4 @@
             this.inherited(arguments);
             this._setupActions();
-            domClass.add(this.domNode, "inheritBgColor bg");
             this.refresh();
         },
@@ -39,5 +38,4 @@
                     properties = lang.mixin({
                         baseClass: 'rftBlockButton',
-                        "class": "inheritBgColor light",
                         label: "Default",
                         iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
Index: Dev/branches/rest-dojo-ui/client/rft/ui/templates/LineWithActionsWidget.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/templates/LineWithActionsWidget.html	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/templates/LineWithActionsWidget.html	(revision 411)
@@ -1,4 +1,4 @@
-<div class="${baseClass} inheritBgColor">
+<div class="${baseClass}">
     <span class="${baseClass}Title" data-dojo-attach-point="titleNode"></span>
-    <span class="${baseClass}Buttons" data-dojo-attach-point="buttonsNode"></span>
+    <span class="${baseClass}Buttons dijitReset" data-dojo-attach-point="buttonsNode"></span>
 </div>
Index: Dev/branches/rest-dojo-ui/client/rft/ui/templates/Selector.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/ui/templates/Selector.html	(revision 410)
+++ Dev/branches/rest-dojo-ui/client/rft/ui/templates/Selector.html	(revision 411)
@@ -4,5 +4,5 @@
     </div>
     <div class="${baseClass}Selected">
-        <div class="${baseClass}Color" data-dojo-attach-point="selectedColorNode"></div>
+        <div class="${baseClass}Indicator" data-dojo-attach-point="selectedColorNode"></div>
         <div class="${baseClass}Item" data-dojo-attach-point="selectedItemNode"></div>
     </div>
