diff --git a/bigbluebutton-client/.actionScriptProperties b/bigbluebutton-client/.actionScriptProperties
index fb5097b677387378731a633a13dd530558cc4d0d..2d7056442a30551c97f4722705ca2cc988ab7136 100755
--- a/bigbluebutton-client/.actionScriptProperties
+++ b/bigbluebutton-client/.actionScriptProperties
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <actionScriptProperties analytics="false" mainApplicationPath="BigBlueButton.mxml" projectUUID="f330b47a-ef44-431d-8c83-1768892be326" version="11">
-  <compiler additionalCompilerArguments="-locale en_US&#13;&#10;-define=GIT::version,27" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="11.2.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
+  <compiler additionalCompilerArguments="-locale en_US&#13;&#10;-show-unused-type-selector-warnings=false" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="11.2.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
     <compilerSourcePath/>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="4" path="">
diff --git a/bigbluebutton-client/branding/default/style/css/BBBBlack.css b/bigbluebutton-client/branding/default/style/css/BBBBlack.css
index af1050468f696c7d82e06ae9a9ba8736debd3af6..8f9818f413385977aad9e0c89d7cda501ad70a91 100755
--- a/bigbluebutton-client/branding/default/style/css/BBBBlack.css
+++ b/bigbluebutton-client/branding/default/style/css/BBBBlack.css
@@ -1,8 +1,13 @@
-Application {
+@namespace mx "library://ns.adobe.com/flex/mx";
+@namespace flexlib "http://code.google.com/p/flexlib/";
+@namespace users "org.bigbluebutton.modules.users.views.*";
+@namespace poll "org.bigbluebutton.modules.polling.views.*";
+
+mx|Application {
   backgroundColor: #000000;
 }
 
-ApplicationControlBar {
+mx|ApplicationControlBar {
   highlightAlphas: 0.1, 0;
   fillAlphas: 0, 0;
   fillColors: #000000, #000000;
@@ -15,7 +20,7 @@ ApplicationControlBar {
   dropShadowColor: #000000;
 }
 
-Panel {
+mx|Panel {
   borderColor: #000000;
   borderAlpha: 1;
   shadowDistance: 1;
@@ -23,7 +28,7 @@ Panel {
   titleStyleName: "mypanelTitle";
 }
 
-ToolTip {
+mx|ToolTip {
 	borderSkin      : ClassReference("org.bigbluebutton.skins.ToolTipSkin");
 	backgroundAlpha : 0.9;
 	cornerRadius    : 3;
@@ -46,7 +51,7 @@ ToolTip {
   paddingRight: 3;
 }
 
-Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
+mx|Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
   textIndent: 0;
   paddingLeft: 10;
   paddingRight: 10;
@@ -73,7 +78,7 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
   textSelectedColor: #504f3d;
 }
 
-DataGrid {
+mx|DataGrid {
   backgroundColor: #000000;
   rollOverColor: #f3f3f3;
   textRollOverColor: #5e5f63;
@@ -353,7 +358,7 @@ DataGrid {
   titleStyleName: "micSettingsWindowTitleStyle";
 }
 
-.micSettingsWindowTitleStyle, webcamSettingsWindowTitleStyle {
+.micSettingsWindowTitleStyle, .webcamSettingsWindowTitleStyle {
   fontFamily: Arial;
   fontSize: 20;  
   fontWeight: bold;
@@ -401,7 +406,7 @@ DataGrid {
   icon:   Embed('assets/images/questionmark.png');
 }
 
-MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/
+flexlib|MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/
 	backgroundSize: '100%';
 	
 	cornerRadius: 5;
@@ -643,4 +648,4 @@ MDIWindow { /*None of the following properties are overridden by the MDIWindow c
 	fontFamily: Arial;
 	fontSize: 20;  
 	fontWeight: bold;
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index 5d15c21ae4d317fdf7f4c9d7d51c138cc0775e32..ce5f94dbc52a4ff194d6b0b6466fea1c52045f49 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -79,7 +79,7 @@
 
 	<target name="branding" depends="init-ant-contrib">
 		<sequential>
-			<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" debug="${DEBUG}" incremental="true" swf-version="13" default-background-color="0xFFFFFF" optimize="true">
+			<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" debug="${DEBUG}" show-unused-type-selector-warnings="false" incremental="true" swf-version="13" default-background-color="0xFFFFFF" optimize="true">
 				<compiler.library-path dir="." append="true">
 					<include name="libs" />
 				</compiler.library-path>
@@ -89,7 +89,10 @@
 
 	<target name="branding-black" depends="init-ant-contrib">
 		<sequential>
-			<mxmlc file="${BASE_DIR}/branding/default/style/css/${blackTheme}" output="${OUTPUT_DIR}/branding/css/${blackTheme}.swf" debug="${DEBUG}" incremental="true" swf-version="13" optimize="true">
+			<mxmlc file="${BASE_DIR}/branding/default/style/css/${blackTheme}" output="${OUTPUT_DIR}/branding/css/${blackTheme}.swf" debug="${DEBUG}" show-unused-type-selector-warnings="false" incremental="true" swf-version="13" optimize="true">
+				<compiler.library-path dir="." append="true">
+					<include name="libs" />
+				</compiler.library-path>
 			</mxmlc>
 		</sequential>
 	</target>
@@ -298,6 +301,7 @@
 				<load-config filename="@{flex}/frameworks/flex-config.xml" />
 				<default-background-color>0xFFFFFF</default-background-color>
 				<source-path path-element="@{flex}/frameworks" />
+				<show-unused-type-selector-warnings>false</show-unused-type-selector-warnings>
 
 				<theme dir="@{flex}/frameworks/themes/Halo">
 					<include name="halo.swc" />