diff --git a/clients/flash/air-client/src/Default.css b/clients/flash/air-client/src/Default.css
index 9e85478b0389..6e179a6214c4 100755
--- a/clients/flash/air-client/src/Default.css
+++ b/clients/flash/air-client/src/Default.css
@@ -1,74 +1,88 @@
-/* CSS file */
 @namespace s "library://ns.adobe.com/flex/spark";
 @namespace mx "library://ns.adobe.com/flex/mx";
 @namespace libChat "org.bigbluebutton.lib.chat.views.*";
+@namespace main "org.bigbluebutton.air.main.views.*";
 
 @font-face { 
-	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	bold; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	bold;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	italic; 
-	fontWeight:	normal; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	italic;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	heavy; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	heavy;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
-	fontFamily:	SourceSansProMX; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	fontFamily:	SourceSansProMX;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	false;
 }
 
 @font-face {
-	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
-	fontFamily:	BBBIcons; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	fontFamily:	BBBIcons;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face {
-	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
-	fontFamily:	BBBIcons; 
-	fontStyle:	normal; 
-	fontWeight:	bold; 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	fontFamily:	BBBIcons;
+	font:	normal;
+	fontWeight:	bold;
 	embedAsCFF:	true;
 }
 
+/* Shared s */
+
 global
 {
 	font-family:	SourceSansPro;
 }
 
+/* Classes s */
+
 s|Application
 {
 	backgroundColor: PropertyReference("bbbBlack");	
 }
 
+/* Loading screen */
+
+main|LoadingScreen {
+	color           : PropertyReference("bbbWhite");	
+	backgroundColor : PropertyReference("bbbBlack");
+	fontSize        : 34;
+	textAlign       : center;
+}
+
+
 s|TextInput
 {
 	fontFamily:		SourceSansPro;
@@ -85,51 +99,61 @@ libChat|NewMessagesIndicator
 	skinClass:			ClassReference("org.bigbluebutton.lib.chat.views.skins.NewMessagesIndicatorSkin");
 }
 
-.mainViewStyle
+.mainView
 {
 	backgroundColor:	PropertyReference("bbbBlack");	
 }
 
-.subViewContentStyle
+.subViewContent
 {
 	backgroundColor:	PropertyReference("bbbWhite");
 }
 
-.titleLabelStyle
+.titleLabel
 {
 	color: 		PropertyReference("bbbWhite");
 	fontSize:	24;
+	left: 90;
+	right: 90;
 }
 
-.topButtonStyle
+.topButton
 {
-	iconSize				: 30;
-	iconColor				: PropertyReference("bbbWhite");
-	iconFont				: BBBIcons;
-	skinClass:			ClassReference("org.bigbluebutton.lib.main.views.skins.TopButtonSkin");
+	iconSize  : 30;
+	iconColor : PropertyReference("bbbWhite");
+	iconFont  : BBBIcons;
+	skinClass : ClassReference("org.bigbluebutton.lib.main.views.skins.TopButtonSkin");
+}
+
+.topLeftButton {
+	left: 30;
+}
+
+.topRightButton {
+	right: 30;
 }
 
-.participantsButtonStyle
+.participantsButton
 {
 	icon: "\ue906";
 }
 
-.settingsButtonStyle
+.settingsButton
 {
 	icon: "\ue902";
 }
 
-.presentationButtonStyle
+.presentationButton
 {
 	icon: "\ue90c";
 }
 
-.backButtonStyle
+.backButton
 {
 	icon: "\ue90e";
 }
 
-.menuButtonStyle
+.menuButton
 {
 	backgroundColor         : PropertyReference("bbbBlue");
 	selectedBackgroundColor : PropertyReference("bbbGrey");
@@ -141,32 +165,32 @@ libChat|NewMessagesIndicator
 	skinClass               : ClassReference("org.bigbluebutton.lib.main.views.skins.MenuButtonSkin");
 }
 
-.micOnButtonStyle
+.micOnButton
 {
 	icon : "\ue91b";
 }
 
-.micOffButtonStyle
+.micOffButton
 {
 	icon : "\ue91c";
 }
 
-.camOnButtonStyle
+.camOnButton
 {
 	icon : "\ue921";
 }
 
-.camOffButtonStyle
+.camOffButton
 {
 	icon : "\ue905";
 }
 
-.handStatusButtonStyle
+.handStatusButton
 {
 	icon : "\ue910";
 }
 
-.participantIconStyle
+.participantIcon
 {
 	circleColor : PropertyReference("bbbBlack");
 	width  : 32;
@@ -174,13 +198,13 @@ libChat|NewMessagesIndicator
 	fontSize : 12;
 }
 
-.chatMessageStyle
+.chatMessage
 {
 	nameFontSize: 		16;
 	timeFontSize:		16;
 }
 
-.sendButtonStyle
+.sendButton
 {
 	color:		PropertyReference("bbbGrey");
 	fontFamily:	BBBIcons;
@@ -191,21 +215,21 @@ libChat|NewMessagesIndicator
 	skinClass:	ClassReference("org.bigbluebutton.lib.chat.views.skins.SendButtonSkin");
 }
 
-.messageInputStyle
+.messageInput
 {
 	fontFamily: SourceSansProMX;
 	contentBackgroundAlpha: 0;
 	skinClass:	ClassReference("org.bigbluebutton.air.chat.views.skins.MessageInputSkin");
 }
 
-.contentStyle
+.content
 {
 	fontSize:	14;
 	color:		PropertyReference("bbbBlack");
 }
 
 /*
-.panelStyle
+.panel
 {
 	backgroundColor:	PropertyReference("bbbWhite");
 	backgroundAlpha:	1;
@@ -213,7 +237,7 @@ libChat|NewMessagesIndicator
 	skinClass:			ClassReference("org.bigbluebutton.web.common.skins.PanelSkin");
 }
 
-.panelTitleStyle
+.panelTitle
 {
 	fontSize:		18;
 	fontWeight:		bold;
@@ -223,7 +247,7 @@ libChat|NewMessagesIndicator
 
 */
 
-.iconStyle
+.icon
 {
 	fontSize:	20;
 	fontFamily:	BBBIcons;
diff --git a/clients/flash/air-client/src/Main.mxml b/clients/flash/air-client/src/Main.mxml
index 432f91998fd4..c33056183cae 100755
--- a/clients/flash/air-client/src/Main.mxml
+++ b/clients/flash/air-client/src/Main.mxml
@@ -4,8 +4,9 @@
 			   applicationComplete="applicationCompleteHandler(event)"
 			   preinitialize="preinitializeHandler(event)"
 			   runtimeDPIProvider="CustomRuntimeDPIProvider"
-			   styleName="mainshellStyle"
+			   styleName="mainshell"
 			   xmlns:main="org.bigbluebutton.air.main.views.*">
+	<fx:Style source="../../shared/assets/css/common.css" />
 	<fx:Style source="Default.css" />
 
 	<fx:Declarations>
@@ -92,17 +93,14 @@
 	<main:LoadingScreen width="100%"
 						height="100%" />
 
-	<s:Group width="100%"
-			 height="100%"
-			 id="mainshell"
-			 visible="false">
-		<s:layout>
-			<s:VerticalLayout gap="0"
-							  horizontalAlign="center" />
-		</s:layout>
-
+	<s:VGroup width="100%"
+			  height="100%"
+			  id="mainshell"
+			  visible="false"
+			  gap="0"
+			  horizontalAlign="center">
 		<main:PagesNavigatorView id="pagesNavigatorView"
 								 width="100%"
 								 height="100%" />
-	</s:Group>
+	</s:VGroup>
 </s:Application>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as
index 5a7d6040e8ef..60bde8a2373f 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as
@@ -8,7 +8,7 @@ package org.bigbluebutton.air.chat.views {
 	public class ChatRoomView extends NoTabView {
 		public function ChatRoomView() {
 			super();
-			styleName = "mainViewStyle";
+			styleName = "mainView";
 			
 			var l:VerticalLayout = new VerticalLayout();
 			l.gap = 0;
@@ -21,7 +21,7 @@ package org.bigbluebutton.air.chat.views {
 			addElement(topToolbar);
 			
 			var skinnableWrapper:SkinnableContainer = new SkinnableContainer();
-			skinnableWrapper.styleName = "subViewContentStyle";
+			skinnableWrapper.styleName = "subViewContent";
 			skinnableWrapper.percentWidth = 100;
 			skinnableWrapper.percentHeight = 100;
 			
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as
index 5b37d1412456..aab3809db171 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as
@@ -5,8 +5,8 @@ package org.bigbluebutton.air.chat.views {
 		public function TopToolbarChat() {
 			super();
 			
-			leftButton.styleName = "backButtonStyle topButtonStyle";
-			rightButton.styleName = "presentationButtonStyle topButtonStyle";
+			leftButton.styleName = "backButton topButton";
+			rightButton.styleName = "presentationButton topButton";
 		}
 	}
 }
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as
index e5ce34ef7de5..00d3965eb79e 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as
@@ -1,6 +1,5 @@
 package org.bigbluebutton.air.common.views {
 	
-	import flash.events.StageOrientationEvent;
 	import spark.components.View;
 	
 	public class NoTabView extends View {
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml
index 7cb0fb8d57b2..5428433f9f47 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml
@@ -1,7 +1,7 @@
 <s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
 		 xmlns:s="library://ns.adobe.com/flex/spark"
 		 xmlns:mx="library://ns.adobe.com/flex/mx"
-		 styleName="participantIconStyle">
+		 styleName="participantIcon">
 
 	<s:Label id="firstLetters"
 			 styleName="nameIconText"
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/services/JoinService.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/services/JoinService.as
index ecd9fbcef543..98c90bf94393 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/services/JoinService.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/services/JoinService.as
@@ -82,10 +82,10 @@ package org.bigbluebutton.air.main.services {
 		protected function onSuccess(data:Object, responseUrl:String, urlRequest:URLRequest, httpStatusCode:Number = 200):void {
 			if (httpStatusCode == 200) {
 				try {
-					/* If redirect is set to false on the join url the response will be XML and there will be 
-					 * an auth_token in the response that can be used to join. If redirect is set to true or 
-					 * left off there will be a sessionToken attached to the responseURL that can be used to 
-					 * join. And if there is an issue with the join request there is a redirect and error 
+					/* If redirect is set to false on the join url the response will be XML and there will be
+					 * an auth_token in the response that can be used to join. If redirect is set to true or
+					 * left off there will be a sessionToken attached to the responseURL that can be used to
+					 * join. And if there is an issue with the join request there is a redirect and error
 					 *  message is in the responseURL as error.
 					 */
 					var xml:XML = new XML(data);
@@ -107,14 +107,14 @@ package org.bigbluebutton.air.main.services {
 					// Need to grab either the error or the sessionToken from the response URL
 					var infoIndex:int = responseUrl.indexOf(ERROR_QUERY_PARAM);
 					if (infoIndex != -1) {
-						var errors:String = unescape(responseUrl.substring(infoIndex+ERROR_QUERY_PARAM.length));
+						var errors:String = unescape(responseUrl.substring(infoIndex + ERROR_QUERY_PARAM.length));
 						trace(errors);
 						onFailure(errors);
 						return
 					}
 					infoIndex = responseUrl.indexOf(TOKEN_QUERY_PARAM);
 					if (infoIndex != -1) {
-						var sessionToken:String = responseUrl.substring(infoIndex+TOKEN_QUERY_PARAM.length);
+						var sessionToken:String = responseUrl.substring(infoIndex + TOKEN_QUERY_PARAM.length);
 						successSignal.dispatch(urlRequest, responseUrl, sessionToken);
 						return;
 					}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/utils/OrientationCalculator.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/utils/OrientationCalculator.as
index 3ccefb1c049e..b37ee6626724 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/utils/OrientationCalculator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/utils/OrientationCalculator.as
@@ -6,16 +6,11 @@
 package org.bigbluebutton.air.main.utils {
 	
 	import flash.display.DisplayObject;
-	import flash.display.Stage;
 	import flash.display.StageOrientation;
 	import flash.events.AccelerometerEvent;
-	import flash.events.Event;
-	import flash.events.EventDispatcher;
 	import flash.events.TimerEvent;
 	import flash.sensors.Accelerometer;
 	import flash.utils.Timer;
-	import flash.utils.clearInterval;
-	import flash.utils.setInterval;
 	
 	public class OrientationCalculator {
 		private static var _checkFrequency:int = 500;
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreen.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreen.as
index 8d24654d3d3a..8fb19f379e6d 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreen.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreen.as
@@ -1,7 +1,8 @@
 package org.bigbluebutton.air.main.views {
-	import spark.components.Group;
 	import spark.components.Label;
 	import spark.components.SkinnableContainer;
+	import spark.layouts.HorizontalAlign;
+	import spark.layouts.VerticalAlign;
 	import spark.layouts.VerticalLayout;
 	
 	public class LoadingScreen extends SkinnableContainer {
@@ -14,20 +15,17 @@ package org.bigbluebutton.air.main.views {
 		public function LoadingScreen() {
 			super();
 			
-			var l:VerticalLayout = new VerticalLayout();
-			l.horizontalAlign = "center";
-			l.verticalAlign = "middle";
-			this.layout = l;
-			this.setStyle("backgroundColor", 0xDDDDDD);
-			this.setStyle("backgroundAlpha", 1);
+			var layout:VerticalLayout = new VerticalLayout();
+			layout.horizontalAlign = HorizontalAlign.CENTER;
+			layout.verticalAlign = VerticalAlign.MIDDLE;
+			this.layout = layout;
+			
+			percentHeight = percentWidth = 100;
 			
 			_stateLabel = new Label();
 			_stateLabel.text = "Loading";
+			_stateLabel.percentWidth = 80;
 			addElement(_stateLabel);
-			
-			percentHeight = percentWidth = 100;
 		}
 	}
 }
-
-
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MainView.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MainView.as
index 880498c43183..dc51e0b517ea 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MainView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MainView.as
@@ -1,33 +1,36 @@
 package org.bigbluebutton.air.main.views {
+	import spark.layouts.VerticalLayout;
+	
 	import org.bigbluebutton.air.common.views.NoTabView;
 	import org.bigbluebutton.lib.main.views.MenuButtonsBase;
 	import org.bigbluebutton.lib.presentation.views.PresentationViewBase;
-	
-	import spark.layouts.VerticalLayout;
+	import org.osmf.layout.HorizontalAlign;
 	
 	public class MainView extends NoTabView {
 		private var _topToolbar:TopToolbarAIR;
+		
 		private var _presentationView:PresentationViewBase;
+		
 		private var _menuButtons:MenuButtonsBase;
 		
 		public function MainView() {
 			super();
-			styleName = "mainViewStyle";
+			styleName = "mainView";
 			
 			var l:VerticalLayout = new VerticalLayout();
 			l.gap = 0;
-			l.horizontalAlign = "center";
+			l.horizontalAlign = HorizontalAlign.CENTER;
 			layout = l;
 			
 			_topToolbar = new TopToolbarAIR();
 			_topToolbar.percentWidth = 100;
-			_topToolbar.height = 60;
+			_topToolbar.height = 80;
 			addElement(_topToolbar);
 			
 			_presentationView = new PresentationViewBase();
 			_presentationView.percentWidth = 100;
 			_presentationView.percentHeight = 100;
-			addElement(_presentationView);			
+			addElement(_presentationView);
 			
 			_menuButtons = new MenuButtonsBase();
 			addElement(_menuButtons);
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/PagesNavigatorViewMediator.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/PagesNavigatorViewMediator.as
index 333572c974d7..f1607e758eb0 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/PagesNavigatorViewMediator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/PagesNavigatorViewMediator.as
@@ -1,93 +1,93 @@
-package org.bigbluebutton.air.main.views {
-	
-	import flash.desktop.NativeApplication;
-	import flash.events.KeyboardEvent;
-	import flash.ui.Keyboard;
-	
-	import mx.events.FlexEvent;
-	
-	import spark.transitions.CrossFadeViewTransition;
-	import spark.transitions.SlideViewTransition;
-	import spark.transitions.ViewTransitionBase;
-	import spark.transitions.ViewTransitionDirection;
-	
-	import org.bigbluebutton.air.common.PageEnum;
-	import org.bigbluebutton.air.common.TransitionAnimationEnum;
-	import org.bigbluebutton.air.main.models.IUISession;
-	
+package org.bigbluebutton.air.main.views {
+	
+	import flash.desktop.NativeApplication;
+	import flash.events.KeyboardEvent;
+	import flash.ui.Keyboard;
+	
+	import mx.events.FlexEvent;
+	
+	import spark.transitions.CrossFadeViewTransition;
+	import spark.transitions.SlideViewTransition;
+	import spark.transitions.ViewTransitionBase;
+	import spark.transitions.ViewTransitionDirection;
+	
+	import org.bigbluebutton.air.common.PageEnum;
+	import org.bigbluebutton.air.common.TransitionAnimationEnum;
+	import org.bigbluebutton.air.main.models.IUISession;
+	
 	import robotlegs.bender.bundles.mvcs.Mediator;
-	
-	public class PagesNavigatorViewMediator extends Mediator {
-		
-		[Inject]
-		public var view:PagesNavigatorView;
-		
-		[Inject]
-		public var uiSession:IUISession
-		
-		override public function initialize():void {
-			NativeApplication.nativeApplication.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown, false, 0, true);
-			uiSession.pageChangedSignal.add(changePage);
-			uiSession.pushPage(PageEnum.MAIN);
-		}
-		
-		private function onKeyDown(event:KeyboardEvent):void {
-			if (event.keyCode == Keyboard.BACK) {
-				event.preventDefault();
-				event.stopImmediatePropagation();
-				uiSession.pushPage(PageEnum.EXIT);
-			}
-		}
-		
-		protected function changePage(pageName:String, pageRemoved:Boolean = false, animation:int = TransitionAnimationEnum.APPEAR, transition:ViewTransitionBase = null):void {
-			switch (animation) {
-				case TransitionAnimationEnum.APPEAR:  {
-					var appear:CrossFadeViewTransition = new CrossFadeViewTransition;
-					appear.duration = 50;
-					appear.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
-					transition = appear;
-					break;
-				}
-				case TransitionAnimationEnum.SLIDE_LEFT:  {
-					var slideLeft:SlideViewTransition = new SlideViewTransition();
-					slideLeft.duration = 300;
-					slideLeft.direction = ViewTransitionDirection.LEFT;
-					slideLeft.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
-					transition = slideLeft;
-					break;
-				}
-				case TransitionAnimationEnum.SLIDE_RIGHT:  {
-					var slideRight:SlideViewTransition = new SlideViewTransition();
-					slideRight.duration = 300;
-					slideRight.direction = ViewTransitionDirection.RIGHT;
-					slideRight.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
-					transition = slideRight;
-					break;
-				}
-				default:  {
-					break;
-				}
-			}
-			if (pageName == PageEnum.MAIN) {
-				view.popAll();
-				view.pushView(PageEnum.getClassfromName(pageName), null, null, transition);
-			} else if (pageRemoved) {
-				view.popView(transition);
-			} else if (pageName != null && pageName != "") {
-				view.pushView(PageEnum.getClassfromName(pageName), null, null, transition);
-			}
-		}
-		
-		protected function onTransitionStart(event:FlexEvent):void {
-			uiSession.pageTransitionStartSignal.dispatch(uiSession.lastPage);
-		}
-		
-		override public function destroy():void {
-			NativeApplication.nativeApplication.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-			uiSession.pageChangedSignal.remove(changePage);
-			super.destroy();
-			view.dispose();
-			view = null;
-		}
-	}
-}
+	
+	public class PagesNavigatorViewMediator extends Mediator {
+		
+		[Inject]
+		public var view:PagesNavigatorView;
+		
+		[Inject]
+		public var uiSession:IUISession
+		
+		override public function initialize():void {
+			NativeApplication.nativeApplication.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown, false, 0, true);
+			uiSession.pageChangedSignal.add(changePage);
+			uiSession.pushPage(PageEnum.MAIN);
+		}
+		
+		private function onKeyDown(event:KeyboardEvent):void {
+			if (event.keyCode == Keyboard.BACK) {
+				event.preventDefault();
+				event.stopImmediatePropagation();
+				uiSession.pushPage(PageEnum.EXIT);
+			}
+		}
+		
+		protected function changePage(pageName:String, pageRemoved:Boolean = false, animation:int = TransitionAnimationEnum.APPEAR, transition:ViewTransitionBase = null):void {
+			switch (animation) {
+				case TransitionAnimationEnum.APPEAR:  {
+					var appear:CrossFadeViewTransition = new CrossFadeViewTransition;
+					appear.duration = 50;
+					appear.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
+					transition = appear;
+					break;
+				}
+				case TransitionAnimationEnum.SLIDE_LEFT:  {
+					var slideLeft:SlideViewTransition = new SlideViewTransition();
+					slideLeft.duration = 300;
+					slideLeft.direction = ViewTransitionDirection.LEFT;
+					slideLeft.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
+					transition = slideLeft;
+					break;
+				}
+				case TransitionAnimationEnum.SLIDE_RIGHT:  {
+					var slideRight:SlideViewTransition = new SlideViewTransition();
+					slideRight.duration = 300;
+					slideRight.direction = ViewTransitionDirection.RIGHT;
+					slideRight.addEventListener(FlexEvent.TRANSITION_START, onTransitionStart);
+					transition = slideRight;
+					break;
+				}
+				default:  {
+					break;
+				}
+			}
+			if (pageName == PageEnum.MAIN) {
+				view.popAll();
+				view.pushView(PageEnum.getClassfromName(pageName), null, null, transition);
+			} else if (pageRemoved) {
+				view.popView(transition);
+			} else if (pageName != null && pageName != "") {
+				view.pushView(PageEnum.getClassfromName(pageName), null, null, transition);
+			}
+		}
+		
+		protected function onTransitionStart(event:FlexEvent):void {
+			uiSession.pageTransitionStartSignal.dispatch(uiSession.lastPage);
+		}
+		
+		override public function destroy():void {
+			NativeApplication.nativeApplication.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
+			uiSession.pageChangedSignal.remove(changePage);
+			super.destroy();
+			view.dispose();
+			view = null;
+		}
+	}
+}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/ParticipantsView.as b/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/ParticipantsView.as
index 4e7e6afaa746..38ee270bd268 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/ParticipantsView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/ParticipantsView.as
@@ -1,15 +1,14 @@
 package org.bigbluebutton.air.participants.views {
-	import org.bigbluebutton.air.common.views.NoTabView;
-	import org.bigbluebutton.lib.participants.views.ParticipantsViewBase;
-	
-	import spark.components.Label;
 	import spark.components.SkinnableContainer;
 	import spark.layouts.VerticalLayout;
 	
+	import org.bigbluebutton.air.common.views.NoTabView;
+	import org.bigbluebutton.lib.participants.views.ParticipantsViewBase;
+	
 	public class ParticipantsView extends NoTabView {
 		public function ParticipantsView() {
 			super();
-			styleName = "mainViewStyle";
+			styleName = "mainView";
 			
 			var l:VerticalLayout = new VerticalLayout();
 			l.gap = 0;
@@ -18,11 +17,11 @@ package org.bigbluebutton.air.participants.views {
 			
 			var topToolbar:TopToolbarParticipants = new TopToolbarParticipants();
 			topToolbar.percentWidth = 100;
-			topToolbar.height = 60;
+			topToolbar.height = 80;
 			addElement(topToolbar);
 			
 			var skinnableWrapper:SkinnableContainer = new SkinnableContainer();
-			skinnableWrapper.styleName = "subViewContentStyle";
+			skinnableWrapper.styleName = "subViewContent";
 			skinnableWrapper.percentWidth = 100;
 			skinnableWrapper.percentHeight = 100;
 			
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/TopToolbarParticipants.as b/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/TopToolbarParticipants.as
index 58b69f7f2588..827cde4181de 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/TopToolbarParticipants.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/participants/views/TopToolbarParticipants.as
@@ -5,8 +5,8 @@ package org.bigbluebutton.air.participants.views {
 		public function TopToolbarParticipants() {
 			super();
 			
-			leftButton.styleName = "topButtonStyle";
-			rightButton.styleName = "presentationButtonStyle topButtonStyle";
+			leftButton.styleName = "topButton";
+			rightButton.styleName = "presentationButton topButton";
 		}
 	}
 }
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/presentation/views/selectwebcam/StreamItemRenderer.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/presentation/views/selectwebcam/StreamItemRenderer.mxml
index d4124c89453a..82f3a2185136 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/presentation/views/selectwebcam/StreamItemRenderer.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/presentation/views/selectwebcam/StreamItemRenderer.mxml
@@ -3,7 +3,7 @@
 				xmlns:s="library://ns.adobe.com/flex/spark"
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:views="org.bigbluebutton.air.common.views.*"
-				styleName="streamItemStyle"
+				styleName="streamItem"
 				dataChange="onDataChange(event)"
 				height="100%">
 	<s:states>
@@ -69,8 +69,8 @@
 		</s:VGroup>
 
 
-		<s:Image styleName.selected="iconStyle selectedIconStyle"
-				 styleName.normal="iconStyle unselectedIconStyle" />
+		<s:Image styleName.selected="icon selectedIcon"
+				 styleName.normal="icon unselectedIcon" />
 	</s:Group>
 
 	<s:Line width="100%">
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/audio/AudioSettingsViewBase.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/audio/AudioSettingsViewBase.mxml
index 49d310e12054..e147b67ab4cc 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/audio/AudioSettingsViewBase.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/audio/AudioSettingsViewBase.mxml
@@ -3,7 +3,7 @@
 				 xmlns:s="library://ns.adobe.com/flex/spark"
 				 xmlns:mx="library://ns.adobe.com/flex/mx"
 				 xmlns:views="org.bigbluebutton.air.common.views.*"
-				 styleName="audioSettingsStyle">
+				 styleName="audioSettings">
 
 	<s:Scroller width="100%"
 				height="100%">
@@ -118,7 +118,7 @@
 			<s:Button id="continueToMeeting"
 					  width="90%"
 					  label="{resourceManager.getString('resources', 'audioSettings.continue')}"
-					  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+					  styleName="userSettingsButton logoutButton contentFontSize" />
 
 		</s:VGroup>
 	</s:Scroller>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/camera/CameraSettingsViewBase.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/camera/CameraSettingsViewBase.mxml
index b17e708a97eb..c59b3e920dac 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/camera/CameraSettingsViewBase.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/camera/CameraSettingsViewBase.mxml
@@ -3,7 +3,7 @@
 				xmlns:s="library://ns.adobe.com/flex/spark"
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:view="org.bigbluebutton.air.common.views.*"
-				styleName="cameraSettingsViewStyle">
+				styleName="cameraSettingsView">
 
 	<s:VGroup width="100%"
 			  height="100%"
@@ -21,7 +21,7 @@
 									height="100%" />
 					<s:Label id="noVideoMessage0"
 							 visible="false"
-							 styleName="noVideoMsgStyle contentFontSize"
+							 styleName="noVideoMsg contentFontSize"
 							 textAlign="center"
 							 width="100%"
 							 height="100%"
@@ -37,7 +37,7 @@
 					</s:layout>
 					<s:List id="cameraprofileslist"
 							width="100%"
-							styleName="cameraProfilesListStyle"
+							styleName="cameraProfilesList"
 							labelField="name"
 							itemRenderer="spark.components.LabelItemRenderer">
 						<s:layout>
@@ -52,15 +52,15 @@
 								  includeInLayout="false"
 								  width="100%"
 								  id="rotateCameraBtn0"
-								  styleName="cameraSettingsRotateButtonStyle videoAudioSettingStyle contentFontSize"
+								  styleName="cameraSettingsRotateButton videoAudioSetting contentFontSize"
 								  label="{resourceManager.getString('resources', 'cameraSettings.rotate')}" />
 					</s:HGroup>
 					<s:Button id="swapCameraBtn0"
-							  styleName="cameraSettingsSwapButtonStyle videoAudioSettingStyle contentFontSize"
+							  styleName="cameraSettingsSwapButton videoAudioSetting contentFontSize"
 							  width="100%"
 							  label="{resourceManager.getString('resources', 'cameraSettings.swap')}" />
 					<s:Button id="startCameraButton0"
-							  styleName="cameraSettingsStartButtonStyle videoAudioSettingStyle contentFontSize"
+							  styleName="cameraSettingsStartButton videoAudioSetting contentFontSize"
 							  width="100%"
 							  label="{resourceManager.getString('resources', 'userDetail.cameraBtn.text')}" />
 				</s:Group>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/lock/LockSettingsViewBase.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/lock/LockSettingsViewBase.mxml
index 21789a58a10a..a4eb7e2371aa 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/lock/LockSettingsViewBase.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/settings/views/lock/LockSettingsViewBase.mxml
@@ -3,7 +3,7 @@
 				xmlns:s="library://ns.adobe.com/flex/spark"
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:view="org.bigbluebutton.air.common.views.*"
-				styleName="lockSettingsStyle">
+				styleName="lockSettings">
 
 	<s:Scroller width="100%"
 				height="100%">
@@ -91,7 +91,7 @@
 			<s:Button id="apply"
 					  width="90%"
 					  label="{resourceManager.getString('resources', 'lockSettings.apply')}"
-					  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+					  styleName="userSettingsButton logoutButton contentFontSize" />
 
 
 		</s:VGroup>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/users/views/userdetails/UserDetailsViewBase.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/users/views/userdetails/UserDetailsViewBase.mxml
index 8c46d0ded5d6..a48dd27f6b51 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/users/views/userdetails/UserDetailsViewBase.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/users/views/userdetails/UserDetailsViewBase.mxml
@@ -3,7 +3,7 @@
 				  xmlns:s="library://ns.adobe.com/flex/spark"
 				  xmlns:mx="library://ns.adobe.com/flex/mx"
 				  xmlns:common="org.bigbluebutton.air.common.views.*"
-				  styleName="userDetailViewStyle">
+				  styleName="userDetailView">
 	<s:Scroller width="100%"
 				height="100%"
 				layoutDirection="">
@@ -21,15 +21,15 @@
 									  horizontalAlign="center" />
 				</s:layout>
 				<s:Image id="userDetailIcon"
-						 styleName="iconStyle userDetailIconStyle" />
+						 styleName="icon userDetailIcon" />
 				<s:Label id="userNameText"
 						 width="100%"
 						 textAlign="center"
-						 styleName="userDetailsNameStyle contentFontSize" />
+						 styleName="userDetailsName contentFontSize" />
 				<s:Label id="roleText"
 						 width="100%"
 						 textAlign="center"
-						 styleName="userDetailsStatusStyle subContentFontSize" />
+						 styleName="userDetailsStatus subContentFontSize" />
 			</s:BorderContainer>
 			<s:VGroup width="100%"
 					  height="30%"
@@ -37,20 +37,20 @@
 					  verticalAlign="middle">
 				<s:Label width="50%"
 						 textAlign="center"
-						 styleName="userDetailsStatusStyle contentFontSize"
+						 styleName="userDetailsStatus contentFontSize"
 						 text="{resourceManager.getString('resources', 'userDetail.media')}" />
 				<s:HGroup horizontalAlign="center">
 					<s:Image id="cameraIcon"
-							 styleName="iconStyle cameraIconStyle" />
+							 styleName="icon cameraIcon" />
 					<s:Image id="micIcon"
-							 styleName="iconStyle micIconStyle" />
+							 styleName="icon micIcon" />
 					<s:Image id="micOffIcon"
-							 styleName="iconStyle micOffIconStyle"
+							 styleName="icon micOffIcon"
 							 visible="false"
 							 includeInLayout="false" />
 					<s:Label id="noMediaText"
 							 width="100%"
-							 styleName="userDetailsStatusStyle subContentFontSize"
+							 styleName="userDetailsStatus subContentFontSize"
 							 visible="false"
 							 includeInLayout="false"
 							 text="{resourceManager.getString('resources', 'userDetail.media.noMedia')}" />
@@ -62,40 +62,40 @@
 				<s:Button id="showCameraButton0"
 						  width="90%"
 						  label="{resourceManager.getString('resources', 'userDetail.cameraBtn.text')}"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button id="showPrivateChat0"
 						  width="90%"
 						  label="{resourceManager.getString('resources', 'userDetail.privateChatBtn.text')}"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button includeInLayout="false"
 						  visible="false"
 						  width="90%"
 						  label="{resourceManager.getString('resources', 'userDetail.clearStatus')}"
 						  id="clearStatusButton0"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button includeInLayout="false"
 						  visible="false"
 						  id="makePresenterButton0"
 						  width="90%"
 						  label="{resourceManager.getString('resources', 'userDetail.presenterBtn.text')}"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button includeInLayout="false"
 						  visible="false"
 						  width="90%"
 						  id="promoteButton0"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button includeInLayout="false"
 						  visible="false"
 						  width="90%"
 						  id="lockButton0"
 						  label="{resourceManager.getString('resources', 'userDetail.lockButton.text')}"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 				<s:Button includeInLayout="false"
 						  visible="false"
 						  width="90%"
 						  id="unlockButton0"
 						  label="{resourceManager.getString('resources', 'userDetail.unlockButton.text')}"
-						  styleName="userSettingsButtonStyle logoutButtonStyle contentFontSize" />
+						  styleName="userSettingsButton logoutButton contentFontSize" />
 			</s:VGroup>
 
 		</s:VGroup>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatVideoView.as b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatVideoView.as
index 61fc7e90df1c..c084d28c3c36 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatVideoView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatVideoView.as
@@ -34,7 +34,7 @@ package org.bigbluebutton.air.video.views.videochat {
 		}
 		
 		private function identifyVideoStream(x:Number, y:Number, name:String):void {
-			this.styleName = "videoTextFieldStyle";
+			this.styleName = "videoTextField";
 			var nameFormat:TextFormat = new TextFormat();
 			nameFormat.size = this.getStyle("fontSize");
 			nameFormat.font = this.getStyle("font-family");
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatViewBase.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatViewBase.mxml
index b9685ab657e9..315afb07dc08 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatViewBase.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoChatViewBase.mxml
@@ -4,7 +4,7 @@
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:view="org.bigbluebutton.air.common.views.*">
 	<s:Label id="noVideoMessage0"
-			 styleName="noVideoMsgStyle contentFontSize"
+			 styleName="noVideoMsg contentFontSize"
 			 textAlign="center"
 			 width="100%"
 			 height="100%"
@@ -19,7 +19,7 @@
 					 width="100%">
 				<s:VideoDisplay id="videostream"
 								width="100%"
-								styleName="videoTextFieldStyle" />
+								styleName="videoTextField" />
 			</s:Group>
 
 			<s:List id="videoStreamsList"
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoStreamsItemRenderer.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoStreamsItemRenderer.mxml
index 0b1f912be79f..0f250f339fdf 100644
--- a/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoStreamsItemRenderer.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/video/views/videochat/VideoStreamsItemRenderer.mxml
@@ -16,7 +16,7 @@
 					micOffIcon.visible = micOffIcon.includeInLayout = (obj.user.voiceJoined && obj.user.muted);
 					listenOnlyIcon.includeInLayout = !micIcon.visible;
 					listenOnlyIcon.visible = listenOnlyIcon.includeInLayout = (!obj.user.voiceJoined && obj.user.listenOnly);
-					micIcon.styleName = (obj.user.talking) ? "iconStyle speakingMicIconStyle" : "iconStyle micIconStyle";
+					micIcon.styleName = (obj.user.talking) ? "icon speakingMicIcon" : "icon micIcon";
 					presentationIcon.visible = obj.user.presenter;
 				}
 			}
@@ -30,7 +30,7 @@
 								paddingBottom="{getStyle('paddingBottom')}" />
 		</s:layout>
 		<s:Image id="presentationIcon"
-				 styleName="iconStyle presentationIconStyle"
+				 styleName="icon presentationIcon"
 				 height="100%" />
 		<s:Label id="title"
 				 width="60%"
@@ -38,16 +38,16 @@
 				 textAlign="center"
 				 styleName="videoStreamName contentFontSize" />
 		<s:Image id="cameraIcon"
-				 styleName="iconStyle cameraIconStyle"
+				 styleName="icon cameraIcon"
 				 height="100%" />
 		<s:Image id="micIcon"
-				 styleName="iconStyle micIconStyle"
+				 styleName="icon micIcon"
 				 height="100%" />
 		<s:Image id="micOffIcon"
-				 styleName="iconStyle micOffIconStyle"
+				 styleName="icon micOffIcon"
 				 height="100%" />
 		<s:Image id="listenOnlyIcon"
-				 styleName="iconStyle listenOnlyIconStyle"
+				 styleName="icon listenOnlyIcon"
 				 height="100%" />
 	</s:Group>
 </s:ItemRenderer>
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml
index 17ab973e7d3b..3ebc1b9a8e6f 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatItemRenderer.mxml
@@ -4,7 +4,7 @@
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:views="org.bigbluebutton.lib.common.views.*"
 				width="100%"
-				styleName="chatMessageStyle">
+				styleName="chatMessage">
 
 	<fx:Script>
 		<![CDATA[
@@ -86,7 +86,7 @@
 										selectable="false"
 										id="message"
 										width="100%"
-										styleName="contentStyle" />
+										styleName="content" />
 				</s:HGroup>
 			</s:VGroup>
 		</s:HGroup>
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml
index 18b1ed8e2641..32c11dc20061 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsItemRenderer.mxml
@@ -4,7 +4,7 @@
 				xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:common="org.bigbluebutton.lib.common.views.*"
 				width="100%"
-				styleName="chatRoomItemStyle"
+				styleName="chatRoomItem"
 				xmlns:views="org.bigbluebutton.lib.chat.views.*">
 
 	<fx:Script>
@@ -41,7 +41,7 @@
 		<s:Image id="publicChatIcon"
 				 visible="false"
 				 includeInLayout="false"
-				 styleName="iconStyle publicChatIconStyle" />
+				 styleName="icon publicChatIcon" />
 		<common:ParticipantIcon id="participantIcon"
 								visible="false"
 								includeInLayout="false" />
@@ -49,6 +49,6 @@
 				 width="100%"
 				 styleName="contentFontSize" />
 		<views:NewMessagesIndicator id="newMessages"
-									styleName="newMessagesIndicatorStyle" />
+									styleName="newMessagesIndicator" />
 	</s:Group>
 </s:ItemRenderer>
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsViewBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsViewBase.as
index 05ce1fc870f2..dc36deb0d25b 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsViewBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatRoomsViewBase.as
@@ -25,7 +25,7 @@ package org.bigbluebutton.lib.chat.views {
 			
 			_chatLabel = new Label();
 			_chatLabel.percentWidth = 100;
-			_chatLabel.styleName = "contentStyle";
+			_chatLabel.styleName = "content";
 			_chatLabel.text = "Messages";
 			addElement(_chatLabel);
 			
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewBase.as
index b636a7d32619..d0abb4bbdc9d 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/ChatViewBase.as
@@ -65,14 +65,14 @@ package org.bigbluebutton.lib.chat.views {
 			_textInput.percentWidth = 100;
 			_textInput.percentHeight = 100;
 			//_textInput.showPromptWhenFocused = false;
-			_textInput.styleName = "messageInputStyle";
+			_textInput.styleName = "messageInput";
 			_inputGroup.addElement(_textInput);
 			
 			_sendButton = new Button();
 			_sendButton.percentHeight = 100;
 			_sendButton.label = "\ue90b";
 			//enabled="{inputMessage0.text!=''}"
-			_sendButton.styleName = "sendButtonStyle";
+			_sendButton.styleName = "sendButton";
 			_inputGroup.addElement(_sendButton);
 			
 			addElement(_inputGroup);
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml
index 3e34cb03ec1c..14f05d2524a7 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/common/views/ParticipantIcon.mxml
@@ -1,7 +1,7 @@
 <s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
 		 xmlns:s="library://ns.adobe.com/flex/spark"
 		 xmlns:mx="library://ns.adobe.com/flex/mx"
-		 styleName="participantIconStyle">
+		 styleName="participantIcon">
 
 	<fx:Script>
 		<![CDATA[
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/ConnectCommand.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/ConnectCommand.as
index 5cf124b6a998..97523c1d5335 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/ConnectCommand.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/commands/ConnectCommand.as
@@ -1,5 +1,5 @@
 package org.bigbluebutton.lib.main.commands {
-	
+
 	import org.bigbluebutton.lib.chat.services.IChatMessageService;
 	import org.bigbluebutton.lib.deskshare.services.IDeskshareConnection;
 	import org.bigbluebutton.lib.main.models.IConferenceParameters;
@@ -13,60 +13,60 @@ package org.bigbluebutton.lib.main.commands {
 	import org.bigbluebutton.lib.voice.models.PhoneOptions;
 	import org.bigbluebutton.lib.voice.services.IVoiceConnection;
 	import org.bigbluebutton.lib.whiteboard.services.IWhiteboardService;
-	
+
 	import robotlegs.bender.bundles.mvcs.Command;
-	
+
 	public class ConnectCommand extends Command {
 		private const LOG:String = "ConnectCommand::";
-		
+
 		[Inject]
 		public var userSession:IUserSession;
-		
+
 		[Inject]
 		public var conferenceParameters:IConferenceParameters;
-		
+
 		[Inject]
 		public var connection:IBigBlueButtonConnection;
-		
+
 		[Inject]
 		public var videoConnection:IVideoConnection;
-		
+
 		[Inject]
 		public var voiceConnection:IVoiceConnection;
-		
+
 		[Inject]
 		public var deskshareConnection:IDeskshareConnection;
-		
+
 		[Inject]
 		public var uri:String;
-		
+
 		[Inject]
 		public var whiteboardService:IWhiteboardService;
-		
+
 		[Inject]
 		public var usersService:IUsersService;
-		
+
 		[Inject]
 		public var chatService:IChatMessageService;
-		
+
 		[Inject]
 		public var presentationService:IPresentationService;
-		
+
 		[Inject]
 		public var connectingFinishedSignal:ConnectingFinishedSignal;
-		
+
 		[Inject]
 		public var connectingFailedSignal:ConnectingFailedSignal;
-		
+
 		[Inject]
 		public var disconnectUserSignal:DisconnectUserSignal;
-		
+
 		[Inject]
 		public var shareMicrophoneSignal:ShareMicrophoneSignal;
-		
+
 		[Inject]
 		public var shareCameraSignal:ShareCameraSignal;
-		
+
 		override public function execute():void {
 			loadConfigOptions();
 			connection.uri = uri;
@@ -74,15 +74,15 @@ package org.bigbluebutton.lib.main.commands {
 			connection.connectionFailureSignal.add(connectionFailure);
 			connection.connect(conferenceParameters);
 		}
-		
+
 		private function loadConfigOptions():void {
 			userSession.phoneOptions = new PhoneOptions(userSession.config.getConfigFor("PhoneModule"));
 			userSession.videoAutoStart = (userSession.config.getConfigFor("VideoconfModule").@autoStart.toString().toUpperCase() == "TRUE") ? true : false;
 			userSession.skipCamSettingsCheck = (userSession.config.getConfigFor("VideoconfModule").@skipCamSettingsCheck.toString().toUpperCase() == "TRUE") ? true : false;
 		}
-		
-		
-		
+
+
+
 		private function connectionSuccess():void {
 			trace(LOG + "successConnected()");
 			userSession.mainConnection = connection;
@@ -98,7 +98,7 @@ package org.bigbluebutton.lib.main.commands {
 			connection.connectionSuccessSignal.remove(connectionSuccess);
 			connection.connectionFailureSignal.remove(connectionFailure);
 		}
-		
+
 		private function onAuthTokenReply(tokenValid:Boolean):void {
 			userSession.authTokenSignal.remove(onAuthTokenReply);
 			if (tokenValid) {
@@ -107,7 +107,7 @@ package org.bigbluebutton.lib.main.commands {
 				// TODO disconnect
 			}
 		}
-		
+
 		private function joiningMeetingSuccess():void {
 			// Set up remaining message sender and receivers:
 			presentationService.setupMessageSenderReceiver();
@@ -120,7 +120,7 @@ package org.bigbluebutton.lib.main.commands {
 			userSession.videoConnection = videoConnection;
 			voiceConnection.uri = userSession.config.getConfigFor("PhoneModule").@uri;
 			userSession.voiceConnection = voiceConnection;
-			
+
 			var audioOptions:Object = new Object();
 			if (userSession.phoneOptions.autoJoin && userSession.phoneOptions.skipCheck) {
 				var forceListenOnly:Boolean = (userSession.config.getConfigFor("PhoneModule").@forceListenOnly.toString().toUpperCase() == "TRUE") ? true : false;
@@ -132,8 +132,8 @@ package org.bigbluebutton.lib.main.commands {
 				audioOptions.listenOnly = userSession.userList.me.listenOnly = true;
 				shareMicrophoneSignal.dispatch(audioOptions);
 			}
-      
-      trace("Configuring deskshare");
+
+			trace("Configuring deskshare");
 			//deskshareConnection.applicationURI = userSession.config.getConfigFor("DeskShareModule").@uri;
 			//deskshareConnection.room = conferenceParameters.room;
 			//deskshareConnection.connect();
@@ -149,25 +149,25 @@ package org.bigbluebutton.lib.main.commands {
 			userSession.failureJoiningMeetingSignal.remove(joiningMeetingFailure);
 			//usersService.getRoomLockState();
 		}
-		
+
 		private function joiningMeetingFailure():void {
 			trace(LOG + "joiningMeetingFailure() -- Failed to join the meeting!!!");
 			userSession.successJoiningMeetingSignal.remove(joiningMeetingSuccess);
 			userSession.failureJoiningMeetingSignal.remove(joiningMeetingFailure);
 		}
-		
+
 		protected function successUsersAdded():void {
 			userSession.userList.allUsersAddedSignal.remove(successUsersAdded);
 			connectingFinishedSignal.dispatch();
 		}
-		
+
 		private function connectionFailure(reason:String):void {
 			trace(LOG + "connectionFailure()");
 			connectingFailedSignal.dispatch("connectionFailed");
 			connection.connectionSuccessSignal.remove(connectionSuccess);
 			connection.connectionFailureSignal.remove(connectionFailure);
 		}
-		
+
 		private function videoConnectedSuccess():void {
 			trace(LOG + "successVideoConnected()");
 			if (userSession.videoAutoStart && userSession.skipCamSettingsCheck) {
@@ -176,7 +176,7 @@ package org.bigbluebutton.lib.main.commands {
 			videoConnection.connectionSuccessSignal.remove(videoConnectedSuccess);
 			videoConnection.connectionFailureSignal.remove(videoConnectionFailure);
 		}
-		
+
 		private function videoConnectionFailure(reason:String):void {
 			trace(LOG + "videoConnectionFailure()");
 			videoConnection.connectionFailureSignal.remove(videoConnectionFailure);
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsBase.as
index 81aed9ecb9e5..22f66dfa770d 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsBase.as
@@ -36,21 +36,21 @@ package org.bigbluebutton.lib.main.views {
 			_micButton.percentWidth = 100;
 			_micButton.percentHeight = 100;
 			_micButton.label = "Mic on";
-			_micButton.styleName = "micOnButtonStyle menuButtonStyle";
+			_micButton.styleName = "micOnButton menuButton";
 			addElement(_micButton);
 			
 			_camButton = new Button();
 			_camButton.percentWidth = 100;
 			_camButton.percentHeight = 100;
 			_camButton.label = "Cam on";
-			_camButton.styleName = "camOnButtonStyle menuButtonStyle";
+			_camButton.styleName = "camOnButton menuButton";
 			addElement(_camButton);
 			
 			_statusButton = new Button();
 			_statusButton.percentWidth = 100;
 			_statusButton.percentHeight = 100;
 			_statusButton.label = "Status";
-			_statusButton.styleName = "handStatusButtonStyle menuButtonStyle";
+			_statusButton.styleName = "handStatusButton menuButton";
 			addElement(_statusButton);
 		}
 	}
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsMediatorBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsMediatorBase.as
index e1b96e9381c5..cb26c7f532ed 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsMediatorBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/MenuButtonsMediatorBase.as
@@ -62,17 +62,17 @@ package org.bigbluebutton.lib.main.views {
 			if (user && user.me) {
 				if (user.hasStream) {
 					view.camButton.label = "Cam off";// ResourceManager.getInstance().getString('resources', 'menuButtons.camOff');
-					view.camButton.styleName = "camOffButtonStyle menuButtonStyle"
+					view.camButton.styleName = "camOffButton menuButton"
 				} else {
 					view.camButton.label = "Cam on";// ResourceManager.getInstance().getString('resources', 'menuButtons.camOn');
-					view.camButton.styleName = "camOnButtonStyle menuButtonStyle"
+					view.camButton.styleName = "camOnButton menuButton"
 				}
 				if (userSession.userList.me.voiceJoined) {
 					view.micButton.label = "Mic off";// ResourceManager.getInstance().getString('resources', 'menuButtons.micOff');
-					view.micButton.styleName = "micOffButtonStyle menuButtonStyle"
+					view.micButton.styleName = "micOffButton menuButton"
 				} else {
 					view.micButton.label = "Mic on";// ResourceManager.getInstance().getString('resources', 'menuButtons.micOn');
-					view.micButton.styleName = "micOnButtonStyle menuButtonStyle"
+					view.micButton.styleName = "micOnButton menuButton"
 				}
 			}
 		}
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/TopToolbarBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/TopToolbarBase.as
index 160f093913c6..3ba83bd06367 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/TopToolbarBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/main/views/TopToolbarBase.as
@@ -1,53 +1,41 @@
 package org.bigbluebutton.lib.main.views {
-	import mx.controls.Spacer;
-	
+
 	import spark.components.Button;
-	import spark.components.HGroup;
+	import spark.components.Group;
 	import spark.components.Label;
-	
-	public class TopToolbarBase extends HGroup {
+
+	public class TopToolbarBase extends Group {
 		private var _leftButton:Button;
-		
+
 		public function get leftButton():Button {
 			return _leftButton;
 		}
-		
+
 		private var _titleLabel:Label;
-		
+
 		public function get titleLabel():Label {
 			return _titleLabel;
 		}
-		
+
 		private var _rightButton:Button;
-		
+
 		public function get rightButton():Button {
 			return _rightButton;
 		}
-		
+
 		public function TopToolbarBase() {
 			super();
-			
-			horizontalAlign = "center";
-			verticalAlign = "middle";
-			
+
 			_leftButton = new Button();
-			_leftButton.styleName = "participantsButtonStyle topButtonStyle";
+			_leftButton.styleName = "participantsButton topButton topLeftButton";
 			addElement(_leftButton);
-			
-			var s:Spacer = new Spacer();
-			s.percentWidth = 100;
-			addElement(s);
-			
+
 			_titleLabel = new Label();
-			_titleLabel.styleName = "titleLabelStyle";
+			_titleLabel.styleName = "titleLabel";
 			addElement(_titleLabel);
-			
-			s = new Spacer();
-			s.percentWidth = 100;
-			addElement(s);
-			
+
 			_rightButton = new Button();
-			_rightButton.styleName = "settingsButtonStyle topButtonStyle";
+			_rightButton.styleName = "settingsButton topButton topRightButton";
 			addElement(_rightButton);
 		}
 	}
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
index 29d09d1ffc70..f944e0814e18 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/services/UsersMessageReceiver.as
@@ -1,28 +1,29 @@
 package org.bigbluebutton.lib.user.services {
 	import mx.utils.ObjectUtil;
-	
+
 	import org.bigbluebutton.lib.common.models.IMessageListener;
 	import org.bigbluebutton.lib.main.commands.AuthenticationSignal;
 	import org.bigbluebutton.lib.main.commands.DisconnectUserSignal;
 	import org.bigbluebutton.lib.main.models.IUserSession;
 	import org.bigbluebutton.lib.main.utils.DisconnectEnum;
 	import org.bigbluebutton.lib.user.models.User;
-	
+
 	public class UsersMessageReceiver implements IMessageListener {
 		private const LOG:String = "UsersMessageReceiver::";
-		
+
 		public var userSession:IUserSession;
-		
+
 		public var authenticationSignal:AuthenticationSignal;
-		
+
 		public var disconnectUserSignal:DisconnectUserSignal;
-		
+
 		private var lastSipEvent:Object = null;
-		
+
 		public function UsersMessageReceiver() {
 		}
-		
+
 		public function onMessage(messageName:String, message:Object):void {
+			trace(LOG + "RECEIVED MESSAGE: [" + messageName + "]");
 			switch (messageName) {
 				case "voiceUserTalking":
 					handleVoiceUserTalking(message);
@@ -96,7 +97,7 @@ package org.bigbluebutton.lib.user.services {
 					break;
 			}
 		}
-		
+
 		private function handleUserLocked(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace("handleUserLocked: " + ObjectUtil.toString(msg));
@@ -107,25 +108,25 @@ package org.bigbluebutton.lib.user.services {
 				userSession.dispatchLockSettings();
 			}
 		}
-		
+
 		private function handleMeetingMuted(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace("handleMeetingMuted: " + ObjectUtil.toString(msg));
 			userSession.meetingMuted = msg.meetingMuted;
 		}
-		
+
 		private function handleMeetingState(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			userSession.meetingMuted = msg.meetingMuted;
 			updateLockSettings(msg.permissions);
 		}
-		
+
 		private function handlePermissionsSettingsChanged(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace("permissionsSettingsChanged: " + ObjectUtil.toString(msg));
 			updateLockSettings(msg);
 		}
-		
+
 		private function updateLockSettings(msg:Object):void {
 			userSession.lockSettings.disableCam = msg.disableCam;
 			userSession.lockSettings.disableMic = msg.disableMic;
@@ -137,19 +138,19 @@ package org.bigbluebutton.lib.user.services {
 			userSession.lockSettings.lockOnJoinConfigurable = msg.lockOnJoinConfigurable;
 			userSession.dispatchLockSettings();
 		}
-		
+
 		private function handleEmojiStatus(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace("UsersMessageReceiver::handleEmojiStatusHand() -- user [" + msg.userId + "," + msg.emojiStatus + "] ");
 			userSession.userList.statusChange(msg.userId, msg.emojiStatus);
 		}
-		
+
 		private function handleVoiceUserTalking(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			//trace(LOG + "handleVoiceUserTalking() -- user [" + +msg.voiceUserId + "," + msg.talking + "] ");
 			userSession.userList.userTalkingChange(msg.voiceUserId, msg.talking);
 		}
-		
+
 		private function handleGetUsersReply(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			for (var i:int; i < msg.users.length; i++) {
@@ -158,13 +159,13 @@ package org.bigbluebutton.lib.user.services {
 			}
 			userSession.userList.allUsersAddedSignal.dispatch();
 		}
-		
+
 		private function handleParticipantJoined(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			var newUser:Object = msg.user;
 			addParticipant(newUser);
 		}
-		
+
 		private function addParticipant(newUser:Object):void {
 			var user:User = new User;
 			user.hasStream = newUser.hasStream;
@@ -183,86 +184,86 @@ package org.bigbluebutton.lib.user.services {
 			user.status = newUser.status;
 			userSession.userList.addUser(user);
 		}
-		
+
 		private function handleParticipantLeft(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleParticipantLeft() -- user [" + msg.user.userId + "] has left the meeting");
 			userSession.userList.removeUser(msg.user.userId);
 		}
-		
+
 		private function handleAssignPresenterCallback(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleAssignPresenterCallback() -- user [" + msg.newPresenterID + "] is now the presenter");
 			userSession.userList.assignPresenter(msg.newPresenterID);
 		}
-		
+
 		private function handleUserJoinedVoice(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			var voiceUser:Object = msg.user.voiceUser;
 			trace(LOG + "handleUserJoinedVoice() -- user [" + msg.user.userId + "] has joined voice with voiceId [" + voiceUser.userId + "]");
 			userSession.userList.userJoinAudio(msg.user.userId, voiceUser.userId, voiceUser.muted, voiceUser.talking, voiceUser.locked);
 		}
-		
+
 		private function handleUserLeftVoice(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleUserLeftVoice() -- user [" + msg.user.userId + "] has left voice");
 			userSession.userList.userLeaveAudio(msg.user.userId);
 		}
-		
+
 		private function handleUserSharedWebcam(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleUserSharedWebcam() -- user [" + msg.userId + "] has shared their webcam with stream [" + msg.webcamStream + "]");
 			userSession.userList.userStreamChange(msg.userId, true, msg.webcamStream);
 		}
-		
+
 		private function handleUserUnsharedWebcam(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleUserUnsharedWebcam() -- user [" + msg.userId + "] has unshared their webcam");
 			userSession.userList.userStreamChange(msg.userId, false, msg.webcamStream);
 		}
-		
+
 		private function handleUserListeningOnly(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleUserListeningOnly -- user [" + msg.userId + "] has listen only set to [" + userSession.userList.me.listenOnly + "]");
 			userSession.userList.listenOnlyChange(msg.userId, userSession.userList.me.listenOnly);
 		}
-		
+
 		private function handleVoiceUserMuted(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleVoiceUserMuted() -- user [" + msg.voiceUserId + ", muted: " + msg.muted + "]");
 			userSession.userList.userMuteChange(msg.voiceUserId, msg.muted);
 		}
-		
+
 		private function handleMeetingHasEnded(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleMeetingHasEnded() -- meeting has ended");
 			userSession.logoutSignal.dispatch();
 			disconnectUserSignal.dispatch(DisconnectEnum.CONNECTION_STATUS_MEETING_ENDED);
 		}
-		
+
 		private function handleJoinedMeeting(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleJoinedMeeting() -- Joining meeting");
 			userSession.joinMeetingResponse(msg);
 		}
-		
+
 		private function handleRecordingStatusChanged(m:Object):void {
 			var msg:Object = JSON.parse(m.msg);
 			trace(LOG + "handleRecordingStatusChanged() -- recording status changed");
 			userSession.recordingStatusChanged(msg.recording);
 		}
-		
+
 		private function handleGetRecordingStatusReply(m:Object):void {
 			trace(LOG + "handleGetRecordingStatusReply() -- recording status");
 			var msg:Object = JSON.parse(m.msg);
 			userSession.recordingStatusChanged(msg.recording);
 		}
-		
+
 		private function handleValidateAuthTokenTimedOut(msg:Object):void {
 			trace(LOG + "handleValidateAuthTokenTimedOut() " + msg.msg);
 			authenticationSignal.dispatch("timedOut");
 		}
-		
+
 		private function handleValidateAuthTokenReply(msg:Object):void {
 			trace(LOG + "*** handleValidateAuthTokenReply " + msg.msg);
 			var map:Object = JSON.parse(msg.msg);
@@ -274,8 +275,9 @@ package org.bigbluebutton.lib.user.services {
 			} else {
 				// why 2 different signals for authentication??  
 				//userUISession.loading = false; in authentication command can break order of functions
-        trace(LOG + "got here!");
-        if (userSession == null) trace(LOG + "User Session is NULL!!!!");
+				trace(LOG + "got here!");
+				if (userSession == null)
+					trace(LOG + "User Session is NULL!!!!");
 				userSession.authTokenSignal.dispatch(true);
 			}
 		}
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UserItemRenderer.mxml b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UserItemRenderer.mxml
index 1bf7b8a72c60..0ad945352c2b 100755
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UserItemRenderer.mxml
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UserItemRenderer.mxml
@@ -5,7 +5,7 @@
 				width="100%"
 				click="onClick()"
 				keyUp="onKeyUp()"
-				styleName="participantItemStyle">
+				styleName="participantItem">
 	<s:states>
 		<s:State name="normal" />
 		<s:State name="hovered" />
@@ -83,17 +83,17 @@
 				<s:VerticalLayout gap="0" />
 			</s:layout>
 			<s:Label id="labelDisplay"
-					 styleName="participantNameStyle" />
+					 styleName="participantName" />
 			<s:Label id="subLabelDisplay"
-					 styleName="participantStatusStyle" />
+					 styleName="participantStatus" />
 		</s:Group>
 		<s:Label id="cameraIcon"
 				 text="&#xe921;"
-				 styleName="iconStyle" />
+				 styleName="icon" />
 		<s:Label id="audioIcon"
-				 styleName="iconStyle" />
+				 styleName="icon" />
 		<s:Label id="lockIcon"
 				 text="&#xe927;"
-				 styleName="iconStyle" />
+				 styleName="icon" />
 	</s:Group>
 </s:ItemRenderer>
diff --git a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UsersViewBase.as b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UsersViewBase.as
index 401fea971bc1..7e62e7dbec4a 100644
--- a/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UsersViewBase.as
+++ b/clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/user/views/UsersViewBase.as
@@ -26,7 +26,7 @@ package org.bigbluebutton.lib.user.views
 			
 			_userLabel = new Label();
 			_userLabel.percentWidth = 100;
-			_userLabel.styleName = "contentStyle";
+			_userLabel.styleName = "content";
 			_userLabel.text = "Users";
 			addElement(_userLabel);
 			
diff --git a/clients/flash/shared/ColorPalette.as b/clients/flash/shared/ColorPalette.as
index 8f598dad2b91..97523f05ee50 100644
--- a/clients/flash/shared/ColorPalette.as
+++ b/clients/flash/shared/ColorPalette.as
@@ -1,7 +1,13 @@
 private const bbbBlack:uint = 0x2A2D33;
+
 private const bbbBlue:uint = 0x299AD5;
+
 private const bbbGreen:uint = 0x4DC0A2;
+
 private const bbbRed:uint = 0xF0615F;
+
 private const bbbDarkGrey:uint = 0x353B42;
+
 private const bbbGrey:uint = 0x8B9AA8;
-private const bbbWhite:uint = 0xF3F6F9;
\ No newline at end of file
+
+private const bbbWhite:uint = 0xF3F6F9;
diff --git a/clients/flash/shared/assets/css/common.css b/clients/flash/shared/assets/css/common.css
new file mode 100644
index 000000000000..0519ca76c524
--- /dev/null
+++ b/clients/flash/shared/assets/css/common.css
@@ -0,0 +1,8 @@
+@namespace s "library://ns.adobe.com/flex/spark";
+@namespace mx "library://ns.adobe.com/flex/mx";
+@namespace views "org.bigbluebutton.lib.main.views.*";
+
+views|TopToolbarBase {
+	verticalCenter: 0;
+	textAlign: center;
+}
diff --git a/clients/flash/web-client/src/main/actionscript/Default.css b/clients/flash/web-client/src/main/actionscript/Default.css
index 14af251daa29..da3d673793af 100755
--- a/clients/flash/web-client/src/main/actionscript/Default.css
+++ b/clients/flash/web-client/src/main/actionscript/Default.css
@@ -69,13 +69,13 @@ libChat|NewMessagesIndicator
 	skinClass:			ClassReference("org.bigbluebutton.lib.chat.views.skins.NewMessagesIndicatorSkin");
 }
 
-.titleLabelStyle
+.titleLabel
 {
 	color: 		#F3F6F9;
 	fontSize:	24;
 }
 
-.topButtonStyle
+.topButton
 {
 	paddingLeft:		24;
 	paddingRight:		24;
@@ -87,17 +87,17 @@ libChat|NewMessagesIndicator
 
 }
 
-.participantsButtonStyle
+.participantsButton
 {
 	backgroundImage:	Embed(source="../../../../shared/assets/res/drawable-mdpi/participants.png");
 }
 
-.settingsButtonStyle
+.settingsButton
 {
 	backgroundImage:	Embed(source="../../../../shared/assets/res/drawable-mdpi/settings.png");
 }
 
-.menuButtonStyle
+.menuButton
 {
 	backgroundColor         : #299AD5;
 	selectedBackgroundColor : #8A9AA7;
@@ -106,32 +106,32 @@ libChat|NewMessagesIndicator
 	skinClass               : ClassReference("org.bigbluebutton.lib.main.views.skins.MenuButtonSkin");
 }
 
-.micOnButtonStyle
+.micOnButton
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/mic.png");
 }
 
-.micOffButtonStyle
+.micOffButton
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/mic_off.png");
 }
 
-.camOnButtonStyle
+.camOnButton
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/cam.png");
 }
 
-.camOffButtonStyle
+.camOffButton
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/cam_off.png");
 }
 
-.handStatusButtonStyle
+.handStatusButton
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/hand.png");
 }
 
-.participantIconStyle
+.participantIcon
 {
 	circleColor : #8898A5;
 	width  : 32;
@@ -139,19 +139,19 @@ libChat|NewMessagesIndicator
 	fontSize : 12;
 }
 
-.chatMessageStyle
+.chatMessage
 {
 	nameFontSize: 		16;
 	timeFontSize:		16;
 }
 
-.contentStyle
+.content
 {
 	fontSize:	14;
 	color:		#8B9AA8;
 }
 
-.panelStyle
+.panel
 {
 	backgroundColor:	#F3F6F9;
 	backgroundAlpha:	1;
@@ -159,7 +159,7 @@ libChat|NewMessagesIndicator
 	skinClass:			ClassReference("org.bigbluebutton.web.common.skins.PanelSkin");
 }
 
-.panelTitleStyle
+.panelTitle
 {
 	fontSize:		18;
 	fontWeight:		bold;
@@ -167,39 +167,39 @@ libChat|NewMessagesIndicator
 	paddingBottom:	10;
 }
 
-.iconStyle
+.icon
 {
 	fontSize   :    20;
 	fontFamily :    BBBIcons;
 	color      :    PropertyReference("bbbGrey");
 }
 
-.cameraIconStyle
+.cameraIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/video.png");
 }
 
-.micIconStyle
+.micIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/microphone.png");
 }
 
-.micOffIconStyle
+.micOffIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/micOffIcon_dark.png");
 }
 
-.speakingMicIconStyle
+.speakingMicIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/microphone_talk.png");
 }
 
-.listenOnlyIconStyle
+.listenOnlyIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/ic_headset.png");
 }
 
-.lockIconStyle
+.lockIcon
 {
 	backgroundImage : Embed(source="../../../../shared/assets/res/drawable-mdpi/lock.png");
 }
diff --git a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/chat/views/ChatPanel.as b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/chat/views/ChatPanel.as
index 2936ecc65068..286d19c38bda 100644
--- a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/chat/views/ChatPanel.as
+++ b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/chat/views/ChatPanel.as
@@ -37,7 +37,7 @@ package org.bigbluebutton.web.chat.views {
 			var l:VerticalLayout = new VerticalLayout();
 			this.layout = l;
 			this.minWidth = 50;
-			this.styleName = "panelStyle";
+			this.styleName = "panel";
 			
 			var g:HGroup = new HGroup();
 			g.percentWidth = 100;
@@ -45,7 +45,7 @@ package org.bigbluebutton.web.chat.views {
 			_title = new Label();
 			_title.percentWidth = 100;
 			_title.text = "Public Chat";
-			_title.styleName = "panelTitleStyle";
+			_title.styleName = "panelTitle";
 			g.addElement(title);
 			
 			_closeButton = new Button();
diff --git a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/participants/views/ParticipantsPanel.as b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/participants/views/ParticipantsPanel.as
index 6fa5d95d6825..8a3fc494aaff 100644
--- a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/participants/views/ParticipantsPanel.as
+++ b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/participants/views/ParticipantsPanel.as
@@ -33,11 +33,11 @@ package org.bigbluebutton.web.participants.views {
 			var l:VerticalLayout = new VerticalLayout();
 			this.layout = l;
 			this.minWidth = 50;
-			this.styleName = "panelStyle";
+			this.styleName = "panel";
 			
 			var title:Label = new Label();
 			title.text = "Participants";
-			title.styleName = "panelTitleStyle";
+			title.styleName = "panelTitle";
 			addElement(title);
 			
 			var participantsView:ParticipantsViewBase = new ParticipantsViewBase();
diff --git a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/video/views/WebcamView.as b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/video/views/WebcamView.as
index 2c81f69b1da7..0a39419f0a76 100644
--- a/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/video/views/WebcamView.as
+++ b/clients/flash/web-client/src/main/actionscript/org/bigbluebutton/web/video/views/WebcamView.as
@@ -54,7 +54,7 @@ package org.bigbluebutton.web.video.views {
 			closeBtn.height = OVERLAY_HEIGHT;
 			closeBtn.width = OVERLAY_HEIGHT;
 			closeBtn.buttonMode = true;
-			closeBtn.styleName = "webcamCloseButtonStyle";
+			closeBtn.styleName = "webcamCloseButton";
 			closeBtn.addEventListener(MouseEvent.CLICK, onCloseClick);
 			addChild(closeBtn);
 		}