Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.

svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

320 files changed, 5031 insertions, 3079 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ad7529ea0a..977251f807 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -227,7 +227,6 @@ else (STANDALONE)
       glib-2.0
       gstreamer-0.10
       gtk-2.0
-      llfreetype2
       pango-1.0
       )
 endif (STANDALONE)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 117e8e28ab..e62d875a01 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -81,6 +81,7 @@ set(llui_SOURCE_FILES
     lltextparser.cpp
     lltrans.cpp
     llui.cpp
+    lluicolor.cpp
     lluicolortable.cpp
     lluictrl.cpp
     lluictrlfactory.cpp
@@ -154,6 +155,7 @@ set(llui_HEADER_FILES
     lltexteditor.h
     lltextparser.h
     lltrans.h
+    lluicolor.h
     lluicolortable.h
     lluiconstants.h
     lluictrlfactory.h
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 51ab3326fe..e19eacb774 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -83,12 +83,12 @@ LLComboBox::Params::Params()
 :	allow_text_entry("allow_text_entry", false),
 	show_text_as_tentative("show_text_as_tentative", true),
 	max_chars("max_chars", 20),
-	arrow_image("arrow_image"),
 	list_position("list_position", BELOW),
 	items("item"),
 	combo_button("combo_button"),
 	combo_list("combo_list"),
-	combo_editor("combo_editor")
+	combo_editor("combo_editor"),
+	drop_down_button("drop_down_button")
 {
 	addSynonym(items, "combo_item");
 }
@@ -104,19 +104,29 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p)
 	mPrearrangeCallback(p.prearrange_callback()),
 	mTextEntryCallback(p.text_entry_callback()),
 	mSelectionCallback(p.selection_callback()),
-	mArrowImage(p.arrow_image),
 	mListPosition(p.list_position)
 {
 	// Text label button
 
-	LLButton::Params button_params = p.combo_button;
+	LLButton::Params button_params = (mAllowTextEntry ? p.combo_button : p.drop_down_button);
 	button_params.mouse_down_callback.function(boost::bind(&LLComboBox::onButtonDown, this));
 	button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM|FOLLOWS_RIGHT);
 	button_params.rect(p.rect);
-	button_params.pad_right(2);
+
+	if(mAllowTextEntry)
+	{
+		button_params.pad_right(2);
+	}
+
+	mArrowImage = button_params.image_unselected;
 
 	mButton = LLUICtrlFactory::create<LLButton>(button_params);
-	mButton->setRightHPad(2);  //redo to compensate for button hack that leaves space for a character
+	if(mAllowTextEntry)
+	{
+		//redo to compensate for button hack that leaves space for a character
+		//unless it is a "minimal combobox"(drop down)
+		mButton->setRightHPad(2);
+	}
 	addChild(mButton);
 
 	LLScrollListCtrl::Params params = p.combo_list;
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index bc98690a01..cb5f72dcbe 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -84,7 +84,6 @@ public:
 		Optional<commit_callback_t> 		prearrange_callback,
 											text_entry_callback,
 											selection_callback;
-		Optional<LLUIImage*>				arrow_image;
 
 		Optional<EPreferredPosition, PreferredPositionValues>	list_position;
 		
@@ -93,6 +92,8 @@ public:
 		Optional<LLScrollListCtrl::Params>	combo_list;
 		Optional<LLLineEditor::Params>		combo_editor;
 
+		Optional<LLButton::Params>          drop_down_button;
+
 		Multiple<ItemParams>				items;
 		
 		Params();
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index f1fc3d8f43..1e8b8a5537 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -177,8 +177,8 @@ void LLConsole::draw()
 
 //	F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
 	F32 console_opacity = llclamp(LLUI::sSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
-//	LLColor4 color = gSavedSkinSettings.getColor("ConsoleBackground");
-	LLColor4 color = LLUI::sSettingGroups["color"]->getColor("ConsoleBackground");
+//	LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
+	LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
 	color.mV[VALPHA] *= console_opacity;
 
 	F32 line_height = mFont->getLineHeight();
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 8b53c46ae9..0448c20068 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -53,8 +53,8 @@ public:
 		Optional<LLUIColor> drag_shadow_color;
 		
 		Params() 
-		:	drag_highlight_color("", LLUI::getCachedColorFunctor("DefaultHighlightLight")),
-			drag_shadow_color("", LLUI::getCachedColorFunctor("DefaultShadowDark"))
+		:	drag_highlight_color("", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
+			drag_shadow_color("", LLUIColorTable::instance().getColor("DefaultShadowDark"))
 		{
 			mouse_opaque(true);
 			follows.flags(FOLLOWS_ALL);
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 8932a7ccf2..d37459c040 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -66,7 +66,7 @@ const S32 TABBED_FLOATER_OFFSET = 0;
 
 std::string	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
 {
-	"closebox.tga",		//BUTTON_CLOSE
+	"Icon_Close_Foreground",		//BUTTON_CLOSE
 	"restore.tga",	//BUTTON_RESTORE
 	"minimize.tga",	//BUTTON_MINIMIZE
 	"tearoffbox.tga",	//BUTTON_TEAR_OFF
@@ -84,7 +84,7 @@ std::string	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] =
 
 std::string	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
 {
-	"close_in_blue.tga",		//BUTTON_CLOSE
+	"Icon_Close_Press",		//BUTTON_CLOSE
 	"restore_pressed.tga",	//BUTTON_RESTORE
 	"minimize_pressed.tga",	//BUTTON_MINIMIZE
 	"tearoff_pressed.tga",	//BUTTON_TEAR_OFF
@@ -221,8 +221,8 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 		mPreviousMinimizedLeft(0),
 		mNotificationContext(NULL)
 {
-	static LLUICachedControl<LLColor4> default_background_color ("FloaterDefaultBackgroundColor", *(new LLColor4));
-	static LLUICachedControl<LLColor4> focus_background_color ("FloaterFocusBackgroundColor", *(new LLColor4));
+	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
+	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
 	
 	for (S32 i = 0; i < BUTTON_COUNT; i++)
 	{
@@ -1449,7 +1449,7 @@ void LLFloater::draw()
 		S32 bottom = LLPANEL_BORDER_WIDTH;
 
 		static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> shadow_color_cached ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow");
 		LLColor4 shadow_color = shadow_color_cached;
 		F32 shadow_offset = (F32)shadow_offset_S32;
 
@@ -1474,7 +1474,7 @@ void LLFloater::draw()
 
 		if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getCurrentTitle().empty())
 		{
-			static LLUICachedControl<LLColor4> titlebar_focus_color ("TitleBarFocusColor", *(new LLColor4));
+			static LLUIColor titlebar_focus_color = LLUIColorTable::instance().getColor("TitleBarFocusColor");
 			// draw highlight on title bar to indicate focus.  RDW
 			const LLFontGL* font = LLFontGL::getFontSansSerif();
 			LLRect r = getRect();
@@ -1533,10 +1533,10 @@ void LLFloater::draw()
 	{
 		// add in a border to improve spacialized visual aclarity ;)
 		// use lines instead of gl_rect_2d so we can round the edges as per james' recommendation
-		static LLUICachedControl<LLColor4> focus_border_color ("FloaterFocusBorderColor", *(new LLColor4));
-		static LLUICachedControl<LLColor4> unfocus_border_color ("FloaterUnfocusBorderColor", *(new LLColor4));
+		static LLUIColor focus_border_color = LLUIColorTable::instance().getColor("FloaterFocusBorderColor");
+		static LLUIColor unfocus_border_color = LLUIColorTable::instance().getColor("FloaterUnfocusBorderColor");
 		LLUI::setLineWidth(1.5f);
-		LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? focus_border_color() : unfocus_border_color;
+		LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? focus_border_color : unfocus_border_color;
 		gl_rect_2d_offset_local(0, getRect().getHeight() + 1, getRect().getWidth() + 1, 0, outlineColor, -LLPANEL_BORDER_WIDTH, FALSE);
 		LLUI::setLineWidth(1.f);
 	}
@@ -1699,7 +1699,6 @@ void LLFloater::buildButtons()
 		p.tab_stop(false);
 		p.follows.flags(FOLLOWS_TOP|FOLLOWS_RIGHT);
 		p.tool_tip(sButtonToolTips[i]);
-		p.image_color(LLUI::getCachedColorFunctor("FloaterButtonImageColor"));
 		p.scale_image(true);
 
 		LLButton* buttonp = LLUICtrlFactory::create<LLButton>(p);
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
index 8846f2a8c4..a99c3a4fe6 100644
--- a/indra/llui/llflyoutbutton.cpp
+++ b/indra/llui/llflyoutbutton.cpp
@@ -54,11 +54,6 @@ LLFlyoutButton::LLFlyoutButton(const Params& p)
 
 	mActionButton = LLUICtrlFactory::create<LLButton>(bp);
 	addChild(mActionButton);
-
-	mButton->setOrigin(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0);
-	mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight());
-	mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
-	mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT);
 }
 
 void LLFlyoutButton::onActionButtonClick(const LLSD& data)
@@ -75,7 +70,7 @@ void LLFlyoutButton::draw()
 
 	//FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
 	// the label reflects the last selected item, for now we have to manually remove the label
-	mButton->setLabel(LLStringUtil::null);
+	setLabel(LLStringUtil::null);
 	LLComboBox::draw();	
 }
 
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index f60fe1eb35..1f1716593a 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -46,10 +46,14 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
 	{
 		Optional<LLButton::Params> action_button;
+		Deprecated                 allow_text_entry;
 
 		Params()
-		:	action_button("action_button")
-		{}
+		:	action_button("action_button"),
+		    allow_text_entry("allow_text_entry")
+		{
+			LLComboBox::Params::allow_text_entry = false;
+		}
 
 	};
 protected:
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 9a4ec7627e..a66f147dcc 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -323,7 +323,7 @@ F32 LLFocusMgr::getFocusFlashAmt() const
 
 LLColor4 LLFocusMgr::getFocusColor() const
 {
-	static LLUICachedControl<LLColor4> focus_color_cached ("FocusColor", *(new LLColor4));
+	static LLUIColor focus_color_cached = LLUIColorTable::instance().getColor("FocusColor");
 	LLColor4 focus_color = lerp(focus_color_cached, LLColor4::white, getFocusFlashAmt());
 	// de-emphasize keyboard focus when app has lost focus (to avoid typing into wrong window problem)
 	if (!mAppHasFocus)
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 5ea45e13cf..925f22d94e 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -184,6 +184,11 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	mBorder = LLUICtrlFactory::create<LLViewBorder>(border_p);
 	addChild( mBorder );
 
+	if(p.background_image.isProvided())
+	{
+		mImage = p.background_image;
+	}
+
 	// clamp text padding to current editor size
 	updateTextPadding();
 	setCursor(mText.length());
@@ -1525,12 +1530,12 @@ void LLLineEditor::draw()
 
 	LLColor4 bg_color = mReadOnlyBgColor.get();
 
-#if 0 // for when we're ready for image art.
+#if 1 // for when we're ready for image art.
 	if( hasFocus())
 	{
 		mImage->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(), gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
 	}
-	mImage->draw(getLocalRect(), mReadOnly ? mReadOnlyBgColor : mWriteableBgColor  );
+	mImage->draw(getLocalRect());
 #else // the old programmer art.
 	// drawing solids requires texturing be disabled
 	{
@@ -1691,7 +1696,7 @@ void LLLineEditor::draw()
 			mMaxHPixels - llround(rendered_pixels_right),
 			&rendered_pixels_right);
 	}
-#if 0 // for when we're ready for image art.
+#if 1 // for when we're ready for image art.
 	mBorder->setVisible(FALSE); // no more programmatic art.
 #endif
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 95221d5fc6..e79afe76d8 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2333,10 +2333,10 @@ BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
 	p.label = menu->getLabel();
 	p.branch = menu;
 	p.jump_key = menu->getJumpKey();
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 
 	LLMenuItemBranchGL* branch = LLUICtrlFactory::create<LLMenuItemBranchGL>(p);
 	success &= append( branch );
@@ -2743,7 +2743,7 @@ void LLMenuGL::draw( void )
 	if (mDropShadowed && !mTornOff)
 	{
 		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
 			color_drop_shadow, drop_shadow_floater );
 	}
@@ -3117,10 +3117,10 @@ BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
 	p.label = menu->getLabel();
 	p.visible = menu->getVisible();
 	p.branch = menu;
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 
 	LLMenuItemBranchDownGL* branch = LLUICtrlFactory::create<LLMenuItemBranchDownGL>(p);
 	success &= branch->addToAcceleratorList(&mAccelerators);
@@ -3804,10 +3804,10 @@ BOOL LLContextMenu::appendContextSubMenu(LLContextMenu *menu)
 	p.name = menu->getName();
 	p.label = menu->getLabel();
 	p.branch = menu;
-	p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
-	p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
-	p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
-	p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+	p.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
+	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
+	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
 	
 	item = LLUICtrlFactory::create<LLContextMenuBranch>(p);
 	LLMenuGL::sMenuContainer->addChild(item->getBranch());
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 526e1c2583..ad257f46c2 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -379,7 +379,7 @@ public:
 			drop_shadow("drop_shadow", true),
 			bg_visible("bg_visible", true),
 			create_jump_keys("create_jump_keys", false),
-			bg_color("bg_color",  LLUI::getCachedColorFunctor( "MenuDefaultBgColor" )),
+			bg_color("bg_color",  LLUIColorTable::instance().getColor( "MenuDefaultBgColor" )),
 			scrollable("scrollable", false)
 		{
 			addSynonym(bg_visible, "opaque");
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 8779eee28d..7557b87b94 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -244,7 +244,7 @@ void LLModalDialog::onClose(bool app_quitting)
 // virtual
 void LLModalDialog::draw()
 {
-	static LLUICachedControl<LLColor4> shadow_color ("ColorDropShadow", *(new LLColor4));
+	static LLUIColor shadow_color = LLUIColorTable::instance().getColor("ColorDropShadow");
 	static LLUICachedControl<S32> shadow_lines ("DropShadowFloater", 0);
 
 	gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 3a76e72868..6a6e15867b 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -428,14 +428,10 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
 		mUIStrings[it->name] = it->text;
 	}
 
-	setName(p.name());
 	setLabel(p.label());
-
 	setShape(p.rect);
 	parseFollowsFlags(p);
 
-	setEnabled(p.enabled);
-	setVisible(p.visible);
 	setToolTip(p.tool_tip());
 	setSaveToXML(p.serializable);
 	
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
index 943e2f55f1..90f51b9919 100644
--- a/indra/llui/llresizehandle.cpp
+++ b/indra/llui/llresizehandle.cpp
@@ -63,7 +63,7 @@ LLResizeHandle::LLResizeHandle(const LLResizeHandle::Params& p)
 {
 	if( RIGHT_BOTTOM == mCorner)
 	{
-		mImage = LLUI::getUIImage("resize_handle_bottom_right_blue.tga");
+		mImage = LLUI::getUIImage("Resize_Corner");
 	}
 	switch( p.corner )
 	{
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 72329a4b32..943891c572 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -111,8 +111,8 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
 					.right(btn_right)
 					.height(spinctrl_btn_height);
 	up_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	up_button_params.image_unselected.name("spin_up_out_blue.tga");
-	up_button_params.image_selected.name("spin_up_in_blue.tga");
+	up_button_params.image_unselected.name("ScrollArrow_Up");
+	up_button_params.image_selected.name("ScrollArrow_Up");
 	up_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
 	up_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
 	up_button_params.tab_stop(false);
@@ -130,8 +130,8 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
 					.bottom(bottom)
 					.height(spinctrl_btn_height);
 	down_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	down_button_params.image_unselected.name("spin_down_out_blue.tga");
-	down_button_params.image_selected.name("spin_down_in_blue.tga");
+	down_button_params.image_unselected.name("ScrollArrow_Down");
+	down_button_params.image_selected.name("ScrollArrow_Down");
 	down_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
 	down_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
 	down_button_params.tab_stop(false);
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index 3bd2c9f9e7..55d6b3159f 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -107,10 +107,10 @@ void LLStatGraph::draw()
 	}
 
 	//gl_drop_shadow(0,  getRect().getHeight(), getRect().getWidth(), 0,
-	//				gSavedSkinSettings.getColor("ColorDropShadow"), 
+	//				LLUIColorTable::instance().getColor("ColorDropShadow"), 
 	//				(S32) gSavedSettings.getF32("DropShadowFloater") );
 
-	color = LLUI::sSettingGroups["color"]->getColor( "MenuDefaultBgColor" );
+	color = LLUIColorTable::instance().getColor( "MenuDefaultBgColor" );
 	gGL.color4fv(color.mV);
 	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
 
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 890abc7d67..1a94fcf2c6 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -106,7 +106,7 @@ protected:
 
 private:
 	BOOL		mVisible;
-	LLColor4	mColor;
+	LLUIColor	mColor;
 	std::string	mFontName;
 	LLFontGL*   mFont;		// cached for performance
 	std::string	mLink;
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 464e4be809..b812e876ef 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -314,7 +314,7 @@ void LLTextBox::draw()
 
 	if( mBorderDropShadowVisible )
 	{
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		static LLUICachedControl<S32> drop_shadow_tooltip ("DropShadowTooltip", 0);
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
 			color_drop_shadow, drop_shadow_tooltip);
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 34bced064e..6649264d9a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -75,7 +75,7 @@ const S32	CURSOR_THICKNESS = 2;
 const S32	SPACES_PER_TAB = 4;
 
 
-LLColor4 LLTextEditor::mLinkColor = LLColor4::blue;
+LLUIColor LLTextEditor::mLinkColor = LLColor4::blue;
 void (* LLTextEditor::mURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&)   = NULL;
@@ -3083,8 +3083,8 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
 
 	if (style->getIsEmbeddedItem())
 	{
-		static LLUICachedControl<LLColor4> text_embedded_item_readonly_color ("TextEmbeddedItemReadOnlyColor", *(new LLColor4));
-		static LLUICachedControl<LLColor4> text_embedded_item_color ("TextEmbeddedItemColor", *(new LLColor4));
+		static LLUIColor text_embedded_item_readonly_color = LLUIColorTable::instance().getColor("TextEmbeddedItemReadOnlyColor");
+		static LLUIColor text_embedded_item_color = LLUIColorTable::instance().getColor("TextEmbeddedItemColor");
 		if (mReadOnly)
 		{
 			color = text_embedded_item_readonly_color;
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index f64353555e..d0769c2a8f 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -512,7 +512,7 @@ private:
 	// Data
 	//
 	LLKeywords		mKeywords;
-	static LLColor4 mLinkColor;
+	static LLUIColor mLinkColor;
 	static void			(*mURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallbackRightClick) (const std::string& url);
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 1d3e5d7a15..12875b4ed1 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1579,7 +1579,6 @@ void LLUI::initClass(const settings_map_t& settings,
 	sSettingGroups = settings;
 
 	if ((get_ptr_in_map(sSettingGroups, std::string("config")) == NULL) ||
-		(get_ptr_in_map(sSettingGroups, std::string("color")) == NULL) ||
 		(get_ptr_in_map(sSettingGroups, std::string("floater")) == NULL) ||
 		(get_ptr_in_map(sSettingGroups, std::string("ignores")) == NULL))
 	{
@@ -1590,7 +1589,7 @@ void LLUI::initClass(const settings_map_t& settings,
 	sAudioCallback = audio_callback;
 	sGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
 	sWindow = NULL; // set later in startup
-	LLFontGL::sShadowColor = LLUI::sSettingGroups["color"]->getColor("ColorDropShadow");
+	LLFontGL::sShadowColor = LLUIColorTable::instance().getColor("ColorDropShadow");
 
 	static LLUICachedControl<bool> show_xui_names ("ShowXUINames", false);
 	LLUI::sShowXUINames = show_xui_names;
@@ -1855,13 +1854,6 @@ void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
 	LLUI::sHtmlHelp = html_help;
 }
 
-// static
-boost::function<const LLColor4&()> LLUI::getCachedColorFunctor(const std::string& color_name)
-{
-	return LLCachedControl<LLColor4>(*sSettingGroups["color"], color_name, LLColor4::magenta);
-}
-
-// static
 LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
 {
 	for (settings_map_t::iterator itor = sSettingGroups.begin();
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index dbd295d4e8..c0873247c0 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -45,6 +45,8 @@
 #include "lluiimage.h"		// *TODO: break this dependency, need to add #include "lluiimage.h" to all widgets that hold an Optional<LLUIImage*> in their paramblocks
 #include "llinitparam.h"
 #include "llregistry.h"
+#include "lluicolor.h"
+#include "lluicolortable.h"
 #include <boost/signals2.hpp>
 #include "lllazyvalue.h"
 
@@ -202,7 +204,6 @@ public:
 	static void screenRectToGL(const LLRect& screen, LLRect *gl);
 	static void glRectToScreen(const LLRect& gl, LLRect *screen);
 	static void setHtmlHelp(LLHtmlHelp* html_help);
-	static boost::function<const LLColor4&()> getCachedColorFunctor(const std::string& color_name);
 	// Returns the control group containing the control name, or the default group
 	static LLControlGroup& getControlControlGroup (const std::string& controlname);
 	
@@ -690,8 +691,6 @@ public:
 	{}
 };
 
-typedef LLLazyValue<LLColor4> LLUIColor;
-
 namespace LLInitParam
 {
 	template<>
@@ -767,11 +766,4 @@ namespace LLInitParam
 	};
 }
 
-namespace LLInitParam
-{
-    template<>
-	bool ParamCompare<LLLazyValue<LLColor4> >::equals(
-		const LLLazyValue<LLColor4> &a, const LLLazyValue<LLColor4> &b); 
-}
-
 #endif
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index 27ba6cc8b4..0320e998d0 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -11,7 +11,10 @@
 
 #include <queue>
 
+#include "lldir.h"
+#include "llui.h"
 #include "lluicolortable.h"
+#include "lluictrlfactory.h"
 
 LLUIColorTable::ColorParams::ColorParams()
 :	value("value"),
@@ -26,17 +29,16 @@ LLUIColorTable::ColorEntryParams::ColorEntryParams()
 }
 
 LLUIColorTable::Params::Params()
-:	color_entries("color_entries")
+:	color_entries("color")
 {
 }
 
-void LLUIColorTable::init(const Params& p)
+void LLUIColorTable::insertFromParams(const Params& p)
 {
 	// this map will contain all color references after the following loop
 	typedef std::map<std::string, std::string> string_string_map_t;
 	string_string_map_t unresolved_refs;
 
-	mColors.clear();
 	for(LLInitParam::ParamIterator<ColorEntryParams>::const_iterator it = p.color_entries().begin();
 		it != p.color_entries().end();
 		++it)
@@ -44,7 +46,7 @@ void LLUIColorTable::init(const Params& p)
 		ColorEntryParams color_entry = *it;
 		if(color_entry.color.value.isChosen())
 		{
-			mColors.insert(string_color_map_t::value_type(color_entry.name, color_entry.color.value));
+			setColor(color_entry.name, color_entry.color.value, mLoadedColors);
 		}
 		else
 		{
@@ -66,19 +68,21 @@ void LLUIColorTable::init(const Params& p)
 		// we haven't visited any references yet
 		visited_refs.clear();
 
-		string_string_map_t::iterator it = unresolved_refs.begin();
+		string_string_map_t::iterator current = unresolved_refs.begin();
+		string_string_map_t::iterator previous;
+
 		while(true)
 		{
-			if(it != unresolved_refs.end())
+			if(current != unresolved_refs.end())
 			{
 				// locate the current reference in the previously visited references...
-				string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(it->first);
+				string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(current->first);
 				if(visited != visited_refs.end()
-			    && !(visited_refs.key_comp()(it->first, visited->first)))
+			    && !(visited_refs.key_comp()(current->first, visited->first)))
 				{
 					// ...if we find the current reference in the previously visited references
 					// we know that there is a cycle
-					std::string ending_ref = it->first;
+					std::string ending_ref = current->first;
 					std::string warning("The following colors form a cycle: ");
 
 					// warn about the references in the chain and remove them from
@@ -102,17 +106,17 @@ void LLUIColorTable::init(const Params& p)
 				else
 				{
 					// ...continue along the reference chain
-					ref_chain.push(it->first);
-					visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(it->first, it));
+					ref_chain.push(current->first);
+					visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(current->first, current));
 				}
 			}
 			else
 			{
 				// since this reference does not refer to another reference it must refer to an
 				// actual color, lets find it...
-				string_color_map_t::iterator color_value = mColors.find(it->second);
+				string_color_map_t::iterator color_value = mLoadedColors.find(previous->second);
 
-				if(color_value != mColors.end())
+				if(color_value != mLoadedColors.end())
 				{
 					// ...we found the color, and we now add every reference in the reference chain
 					// to the color map
@@ -120,7 +124,7 @@ void LLUIColorTable::init(const Params& p)
 						iter != visited_refs.end();
 						++iter)
 					{
-						mColors.insert(string_color_map_t::value_type(iter->first, color_value->second));
+						setColor(iter->first, color_value->second, mLoadedColors);
 						unresolved_refs.erase(iter->second);
 					}
 
@@ -143,13 +147,142 @@ void LLUIColorTable::init(const Params& p)
 			}
 
 			// find the next color reference in the reference chain
-			it = unresolved_refs.find(it->second);
+			previous = current;
+			current = unresolved_refs.find(current->second);
+		}
+	}
+}
+
+void LLUIColorTable::clear()
+{
+	clearTable(mLoadedColors);
+	clearTable(mUserSetColors);
+}
+
+LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& default_color) const
+{
+	string_color_map_t::const_iterator iter = mUserSetColors.find(name);
+	if(iter != mUserSetColors.end())
+	{
+		return LLUIColor(&iter->second);
+	}
+
+	iter = mLoadedColors.find(name);
+	return (iter != mLoadedColors.end() ? LLUIColor(&iter->second) : LLUIColor(default_color));
+}
+
+// update user color, loaded colors are parsed on initialization
+void LLUIColorTable::setColor(const std::string& name, const LLColor4& color)
+{
+	setColor(name, color, mUserSetColors);
+}
+
+bool LLUIColorTable::loadFromSettings()
+{
+	bool result = false;
+
+	std::string default_filename = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "colors_def.xml");
+	result |= loadFromFilename(default_filename);
+
+	std::string current_filename = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "colors_def.xml");
+	if(current_filename != default_filename)
+	{
+		result |= loadFromFilename(current_filename);
+	}
+
+	std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml");
+	loadFromFilename(user_filename);
+
+	return result;
+}
+
+void LLUIColorTable::saveUserSettings() const
+{
+	Params params;
+
+	for(string_color_map_t::const_iterator it = mUserSetColors.begin();
+		it != mUserSetColors.end();
+		++it)
+	{
+		ColorEntryParams color_entry;
+		color_entry.name = it->first;
+		color_entry.color.value = it->second;
+
+		params.color_entries.add(color_entry);
+	}
+
+	LLXMLNodePtr output_node = new LLXMLNode("colors", false);
+	LLXUIParser::instance().writeXUI(output_node, params);
+
+	if(!output_node->isNull())
+	{
+		const std::string& filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml");
+		LLFILE *fp = LLFile::fopen(filename, "w");
+
+		if(fp != NULL)
+		{
+			LLXMLNode::writeHeaderToFile(fp);
+			output_node->writeToFile(fp);
+
+			fclose(fp);
 		}
 	}
 }
 
-const LLColor4& LLUIColorTable::getColor(const std::string& name) const
+bool LLUIColorTable::colorExists(const std::string& color_name) const
+{
+	return ((mLoadedColors.find(color_name) != mLoadedColors.end())
+		 || (mUserSetColors.find(color_name) != mUserSetColors.end()));
+}
+
+void LLUIColorTable::clearTable(string_color_map_t& table)
+{
+	for(string_color_map_t::iterator it = table.begin();
+		it != table.end();
+		++it)
+	{
+		it->second = LLColor4::magenta;
+	}
+}
+
+// this method inserts a color into the table if it does not exist
+// if the color already exists it changes the color
+void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, string_color_map_t& table)
+{
+	string_color_map_t::iterator it = table.lower_bound(name);
+	if(it != table.end()
+	&& !(table.key_comp()(name, it->first)))
+	{
+		it->second = color;
+	}
+	else
+	{
+		table.insert(it, string_color_map_t::value_type(name, color));
+	}
+}
+
+bool LLUIColorTable::loadFromFilename(const std::string& filename)
 {
-	string_color_map_t::const_iterator iter = mColors.find(name);
-	return (iter != mColors.end() ? iter->second : LLColor4::magenta);
+	LLXMLNodePtr root;
+
+	if(!LLXMLNode::parseFile(filename, root, NULL))
+	{
+		llwarns << "Unable to parse color file " << filename << llendl;
+		return false;
+	}
+
+	Params params;
+	LLXUIParser::instance().readXUI(root, params);
+
+	if(params.validateBlock())
+	{
+		insertFromParams(params);
+	}
+	else
+	{
+		llwarns << filename << " failed to load" << llendl;
+		return false;
+	}
+
+	return true;
 }
diff --git a/indra/llui/lluicolortable.h b/indra/llui/lluicolortable.h
index dcbb1ee5cb..f102a573b8 100644
--- a/indra/llui/lluicolortable.h
+++ b/indra/llui/lluicolortable.h
@@ -17,8 +17,11 @@
 
 #include "v4color.h"
 
+class LLUIColor;
+
 class LLUIColorTable : public LLSingleton<LLUIColorTable>
 {
+LOG_CLASS(LLUIColorTable);
 public:
 	struct ColorParams : LLInitParam::Choice<ColorParams>
 	{
@@ -44,15 +47,37 @@ public:
 	};
 
 	// define colors by passing in a param block that can be generated via XUI file or manually
-	void init(const Params& p);
+	void insertFromParams(const Params& p);
+
+	// reset all colors to default magenta color
+	void clear();
 
 	// color lookup
-	const LLColor4& getColor(const std::string& name) const;
+	LLUIColor getColor(const std::string& name, const LLColor4& default_color = LLColor4::magenta) const;
+
+	// if the color is in the table, it's value is changed, otherwise it is added
+	void setColor(const std::string& name, const LLColor4& color);
+
+	// returns true if color_name exists in the table
+	bool colorExists(const std::string& color_name) const;
+
+	// loads colors from settings files
+	bool loadFromSettings();
+
+	// saves colors specified by the user to the users skin directory
+	void saveUserSettings() const;
 
 private:
-	// consider using sorted vector
+	bool loadFromFilename(const std::string& filename);
+
+	// consider using sorted vector, can be much faster
 	typedef std::map<std::string, LLColor4>  string_color_map_t;
-	string_color_map_t mColors;
+	
+	void clearTable(string_color_map_t& table);
+	void setColor(const std::string& name, const LLColor4& color, string_color_map_t& table);
+
+	string_color_map_t mLoadedColors;
+	string_color_map_t mUserSetColors;
 };
 
 #endif // LL_LLUICOLORTABLE_H
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 0fbcf24c49..395bed7959 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -918,12 +918,4 @@ namespace LLInitParam
     {
     	return false;
     }
-
-    template<> 
-	bool ParamCompare<LLLazyValue<LLColor4> >::equals(
-		const LLLazyValue<LLColor4> &a, 
-		const LLLazyValue<LLColor4> &b)    
-    {
-    	return a.get() == b.get();
-    }
 }
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 24e4ad18e6..24caf51159 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -398,11 +398,11 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& na
 {
 	std::string colorstring;
 	BOOL res = node->getAttributeString(name.c_str(), colorstring);
-	if (res && LLUI::sSettingGroups["color"])
+	if (res)
 	{
-		if (LLUI::sSettingGroups["color"]->controlExists(colorstring))
+		if (LLUIColorTable::instance().colorExists(colorstring))
 		{
-			color.setVec(LLUI::sSettingGroups["color"]->getColor(colorstring));
+			color.setVec(LLUIColorTable::instance().getColor(colorstring));
 		}
 		else
 		{
@@ -1010,7 +1010,7 @@ bool LLXUIParser::writeUIColorValue(const void* val_ptr, const name_stack_t& sta
 		LLUIColor color = *((LLUIColor*)val_ptr);
 		//RN: don't write out the color that is represented by a function
 		// rely on param block exporting to get the reference to the color settings
-		if (color.isUsingFunction()) return false;
+		if (color.isReference()) return false;
 		node->setFloatValue(4, color.get().mV);
 		return true;
 	}
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index b9c61b1fed..f8d584bc75 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -305,7 +305,7 @@ fail:
 	static T* getDefaultWidget(const std::string& name)
 	{
 		dummy_widget_creator_func_t* dummy_func = LLDummyWidgetRegistry::instance().getValue(&typeid(T));
-		return dynamic_cast<T*>((*dummy_func)(name));
+		return dummy_func ? dynamic_cast<T*>((*dummy_func)(name)) : NULL;
 	}
 
 	template <class T> 
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 8e0de0cb0c..84bc2d1bab 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -74,7 +74,7 @@ void LLUIImage::setScaleRegion(const LLRectf& region)
 //TODO: move drawing implementation inside class
 void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const
 {
-	gl_draw_image(x, y, mImage, color, mClipRegion);
+	gl_draw_scaled_image(x, y, getWidth(), getHeight(), mImage, color, mClipRegion);
 }
 
 void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index e35026cd3d..e3b473b5f6 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -60,11 +60,11 @@ public:
 	
 	void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const;
 	void drawSolid(const LLRect& rect, const LLColor4& color) const { drawSolid(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
-	void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, mImage->getWidth(0), mImage->getHeight(0), color); }
+	void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, getWidth(), getHeight(), color); }
 
 	void drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const;
 	void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
-	void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
+	void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, getWidth(), getHeight(), color, border_width); }
 	
 	const std::string& getName() const { return mName; }
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index d225ad2767..29d0f6a168 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1325,13 +1325,6 @@ void LLView::draw()
 		LLRect rootRect = getRootView()->getRect();
 		LLRect screenRect;
 
-		// draw focused control on top of everything else
-		LLView* focus_view = gFocusMgr.getKeyboardFocus();
-		if (focus_view && focus_view->getParent() != this)
-		{
-			focus_view = NULL;
-		}
-
 		++sDepth;
 
 		for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend();)  // ++child_iter)
@@ -1339,7 +1332,7 @@ void LLView::draw()
 			child_list_reverse_iter_t child = child_iter++;
 			LLView *viewp = *child;
 
-			if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid())
+			if (viewp->getVisible() && viewp->getRect().isValid())
 			{
 				// Only draw views that are within the root view
 				localRectToScreen(viewp->getRect(),&screenRect);
@@ -1357,11 +1350,6 @@ void LLView::draw()
 
 		}
 		--sDepth;
-
-		if (focus_view && focus_view->getVisible())
-		{
-			drawChild(focus_view);
-		}
 	}
 
 	gGL.getTexUnit(0)->disable();
@@ -1398,7 +1386,7 @@ void LLView::drawDebugRect()
 			}
 			else
 			{
-				static LLUICachedControl<LLColor4> scroll_highlighted_color ("ScrollHighlightedColor", *(new LLColor4));
+				static LLUIColor scroll_highlighted_color = LLUIColorTable::instance().getColor("ScrollHighlightedColor");
 				border_color = scroll_highlighted_color;
 			}
 		}
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index 04577bfc3b..f53c62580f 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -142,8 +142,25 @@ LLDir_Mac::LLDir_Mac()
 		CFURLRefToLLString(executableParentURLRef, mExecutableDir, true);
 		
 		// mAppRODataDir
-		CFURLRef	resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
-		CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+		// *NOTE: When running in a dev tree, use the copy of app_settings and
+		// skins in indra/newview/ rather than in the application bundle.  This
+		// mirrors Windows dev environment behavior and allows direct checkin
+		// of edited skins/xui files. JC
+		U32 indra_pos = mExecutableDir.find("/indra");
+		if (indra_pos != std::string::npos)
+		{
+			// ...we're in a dev checkout
+			mAppRODataDir = mExecutableDir.substr(0, indra_pos)
+				+ "/indra/newview";
+			llinfos << "Running in dev checkout with mAppRODataDir "
+				<< mAppRODataDir << llendl;
+		}
+		else
+		{
+			// ...normal installation running
+			CFURLRef resourcesURLRef = CFBundleCopyResourcesDirectoryURL(mainBundleRef);
+			CFURLRefToLLString(resourcesURLRef, mAppRODataDir, true);
+		}
 		
 		// mOSUserDir
 		error = FSFindFolder(kUserDomain, kApplicationSupportFolderType, true, &fileRef);
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index b80080e458..beaf5c3488 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -64,7 +64,7 @@ if (NOT LINUX OR VIEWER)
       ${UI_LIBRARIES}     # for GTK
       ${SDL_LIBRARY}
       )
-endif (VIEWER)
+endif (NOT LINUX OR VIEWER)
 
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
@@ -96,7 +96,7 @@ if (LINUX AND VIEWER)
        llkeyboardsdl.h
        llwindowsdl.h
        )
-endif (LINUX)
+endif (LINUX AND VIEWER)
 
 if (WINDOWS)
   list(APPEND llwindow_SOURCE_FILES
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index afa7f707f1..567fda0034 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3329,17 +3329,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>NotFullScreen</key>
-    <map>
-      <key>Comment</key>
-      <string>Run SL in non fullscreen mode</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FullScreenAspectRatio</key>
     <map>
       <key>Comment</key>
@@ -5460,17 +5449,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>RenderCustomSettings</key>
-    <map>
-      <key>Comment</key>
-      <string>Do you want to set the graphics settings yourself</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>RenderDebugAlphaMask</key>
     <map>
       <key>Comment</key>
@@ -5758,6 +5736,21 @@
       <key>Value</key>
       <integer>2</integer>
     </map>
+    <key>RenderGlowLumWeights</key>
+    <map>
+      <key>Comment</key>
+      <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>0.299</real>
+        <real>0.587</real>
+        <real>0.114</real>
+      </array>
+    </map>
     <key>RenderGlowMaxExtractAlpha</key>
     <map>
       <key>Comment</key>
@@ -5813,6 +5806,21 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
+    <key>RenderGlowWarmthWeights</key>
+    <map>
+      <key>Comment</key>
+      <string>Weight of each color channel used before finding the max warmth</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Vector3</string>
+      <key>Value</key>
+      <array>
+        <real>1.0</real>
+        <real>0.5</real>
+        <real>0.7</real>
+      </array>
+    </map>
     <key>RenderGlowWidth</key>
     <map>
       <key>Comment</key>
@@ -6589,6 +6597,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowAdvancedGraphicsSettings</key>
+    <map>
+      <key>Comment</key>
+      <string>Show advanced graphics settings</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowAllObjectHoverTip</key>
     <map>
       <key>Comment</key>
@@ -7230,6 +7249,21 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SkyNightColorShift</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls moonlight color (base color applied to moon as light source)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color3</string>
+      <key>Value</key>
+      <array>
+        <real>0.67</real>
+        <real>0.67</real>
+        <real>1.0</real>
+      </array>
+    </map>
     <key>SkyOverrideSimSunPosition</key>
     <map>
       <key>Comment</key>
@@ -9314,6 +9348,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WindowFullScreen</key>
+    <map>
+      <key>Comment</key>
+      <string>Run SL in fullscreen mode</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>WindowHeight</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 8a050539d7..22d54fe627 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -361,7 +361,7 @@ LLAgent::LLAgent() :
 	mAutoPilotFinishedCallback(NULL),
 	mAutoPilotCallbackData(NULL),
 	
-	mEffectColor(0.f, 1.f, 1.f, 1.f),
+	mEffectColor(LLColor4(0.f, 1.f, 1.f, 1.f)),
 
 	mHaveHomePosition(FALSE),
 	mHomeRegionHandle( 0 ),
@@ -413,7 +413,7 @@ void LLAgent::init()
 	mCameraZoomFraction = 1.f;
 	mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
 
-	mEffectColor = gSavedSkinSettings.getColor4("EffectColor");
+	mEffectColor = LLUIColorTable::instance().getColor("EffectColor");
 
 	gSavedSettings.getControl("PreferredMaturity")->getValidateSignal()->connect(boost::bind(&LLAgent::validateMaturity, this, _2));
 	gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLAgent::handleMaturity, this, _2));
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 94f6229838..743784b2ef 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -44,6 +44,7 @@
 #include "llcharacter.h" 			// LLAnimPauseRequest
 #include "llfollowcam.h" 			// Ventrella
 #include "llagentdata.h" 			// gAgentID, gAgentSessionID
+#include "lluicolor.h"
 #include "llvoavatardefines.h"
 
 extern const BOOL 	ANIMATE;
@@ -829,7 +830,7 @@ public:
 	F32				mHUDTargetZoom;	// Target zoom level for HUD objects (used when editing)
 	F32				mHUDCurZoom; 	// Current animated zoom level for HUD objects
 private:
-	LLColor4 		mEffectColor;
+	LLUIColor 		mEffectColor;
 
 /**                    Camera
  **                                                                            **
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2c570de697..0253d9e8d5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -668,7 +668,6 @@ bool LLAppViewer::init()
 	// Widget construction depends on LLUI being initialized
 	LLUI::settings_map_t settings_map;
 	settings_map["config"] = &gSavedSettings;
-	settings_map["color"] = &gSavedSkinSettings;
 	settings_map["ignores"] = &gWarningSettings;
 	settings_map["floater"] = &gSavedSettings; // *TODO: New settings file
 	settings_map["account"] = &gSavedPerAccountSettings;
@@ -1346,8 +1345,8 @@ bool LLAppViewer::cleanup()
 	// save their rects on delete.
 	gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
 	
-	//*FIX: don't overwrite user color tweaks with *all* colors
-	gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+	LLUIColorTable::instance().saveUserSettings();
+
 	// PerAccountSettingsFile should be empty if no use has been logged on.
 	// *FIX:Mani This should get really saved in a "logoff" mode. 
 	gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
@@ -1361,7 +1360,7 @@ bool LLAppViewer::cleanup()
 	gWarningSettings.saveToFile(warnings_settings_filename, TRUE);
 
 	gSavedSettings.cleanup();
-	gSavedSkinSettings.cleanup();
+	LLUIColorTable::instance().clear();
 	gCrashSettings.cleanup();
 
 	// Save URL history file
@@ -1701,43 +1700,11 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
 
 void LLAppViewer::loadColorSettings()
 {
-	gSavedSkinSettings.cleanup();
-
-	loadSettingsFromDirectory("DefaultSkin");
-	loadSettingsFromDirectory("CurrentSkin", true);
-	loadSettingsFromDirectory("UserSkin");
-
-	class ColorConverterFunctor : public LLControlGroup::ApplyFunctor
+	if(!LLUIColorTable::instance().loadFromSettings())
 	{
-	public:
-		explicit ColorConverterFunctor(LLUIColorTable::Params& result)
-			:mResult(result)
-		{
-		}
-
-		void apply(const std::string& name, LLControlVariable* control)
-		{
-			if(control->isType(TYPE_COL4))
-			{
-				LLUIColorTable::ColorParams color;
-				color.value = (LLColor4)control->getValue();
-
-				LLUIColorTable::ColorEntryParams color_entry;
-				color_entry.name = name;
-				color_entry.color = color;
-
-				mResult.color_entries.add(color_entry);
-			}
-		}
-
-	private:
-		LLUIColorTable::Params& mResult;
-	};
-
-	LLUIColorTable::Params params;
-	ColorConverterFunctor ccf(params);
-	LLControlGroup::getInstance("Skinning")->applyToAll(&ccf);
-	LLUIColorTable::instance().init(params);
+		convert_legacy_color_settings();
+		LLUIColorTable::instance().loadFromSettings();
+	}
 }
 
 bool LLAppViewer::initConfiguration()
@@ -1781,9 +1748,6 @@ bool LLAppViewer::initConfiguration()
 	gSavedSettings.setString("ClientSettingsFile", 
         gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
 
-	gSavedSettings.setString("SkinningSettingsFile",
-		gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
-
 	gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
 
 #ifndef	LL_RELEASE_FOR_DOWNLOAD
@@ -2039,9 +2003,6 @@ bool LLAppViewer::initConfiguration()
     if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
     {   
         gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
-
-		gSavedSettings.setString("SkinningSettingsFile",
-			gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
     }
 
     mYieldTime = gSavedSettings.getS32("YieldTime");
@@ -2265,10 +2226,10 @@ bool LLAppViewer::initWindow()
 		gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
 		FALSE, ignorePixelDepth);
 		
-	if (!gSavedSettings.getBOOL("NotFullScreen"))
+	if (gSavedSettings.getBOOL("WindowFullScreen"))
 	{
+		// request to go full screen... which will be delayed until login
 		gViewerWindow->toggleFullscreen(FALSE);
-			// request to go full screen... which will be delayed until login
 	}
 	
 	if (gSavedSettings.getBOOL("WindowMaximized"))
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index d26da81179..604a77dac0 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -93,6 +93,11 @@ LLBottomTray::LLBottomTray()
 	}
 
 	LLIMMgr::getInstance()->addSessionObserver(this);
+
+	//this is to fix a crash that occurs because LLBottomTray is a singleton
+	//and thus is deleted at the end of the viewers lifetime, but to be cleanly
+	//destroyed LLBottomTray requires some subsystems that are long gone
+	LLUI::getRootView()->addChild(this);
 }
 
 LLBottomTray::~LLBottomTray()
@@ -495,4 +500,3 @@ LLWString LLBottomTray::stripChannelNumber(const LLWString &mesg, S32* channel)
 		return mesg;
 	}
 }
-
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 1844934e6a..355a90209a 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -684,7 +684,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 			{
 				std::string notifyMsg = notification->getMessage();
 				if (!notifyMsg.empty())
-					floater->addHistoryLine(notifyMsg,gSavedSkinSettings.getColor4("SystemChatColor"));
+					floater->addHistoryLine(notifyMsg,LLUIColorTable::instance().getColor("SystemChatColor"));
 			}
 		}
 
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 811ce39228..a97e56d60b 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -729,13 +729,11 @@ LLTalkButton::LLTalkButton(const LLUICtrl::Params& p)
 	speak_params.label("Speak");
 	speak_params.label_selected("Speak");
 	speak_params.font(LLFontGL::getFontSansSerifSmall());
-	speak_params.label_color(LLColor4::black);
-	speak_params.label_color_selected(LLColor4::black);
 	speak_params.tab_stop(false);
 	speak_params.is_toggle(true);
 	speak_params.picture_style(true);
-	speak_params.image_selected(LLUI::getUIImage("flyout_btn_left_selected.tga")); 
-	speak_params.image_unselected(LLUI::getUIImage("flyout_btn_left.tga"));
+	speak_params.image_selected(LLUI::getUIImage("SegmentedBtn_Left_Selected")); 
+	speak_params.image_unselected(LLUI::getUIImage("SegmentedBtn_Left_Off"));
 	mSpeakBtn = LLUICtrlFactory::create<LLButton>(speak_params);
 	addChild(mSpeakBtn);
 
@@ -749,8 +747,8 @@ LLTalkButton::LLTalkButton(const LLUICtrl::Params& p)
 	show_params.tab_stop(false);
 	show_params.is_toggle(true);
 	show_params.picture_style(true);
-	show_params.image_selected(LLUI::getUIImage("talk_btn_right_selected.tga"));
-	show_params.image_unselected(LLUI::getUIImage("talk_btn_right.tga"));
+	show_params.image_selected(LLUI::getUIImage("ComboButton_Selected"));
+	show_params.image_unselected(LLUI::getUIImage("ComboButton_Off"));
 	mShowBtn = LLUICtrlFactory::create<LLButton>(show_params);
 	addChild(mShowBtn);
 
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 0e5b943dd3..f43b625d17 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -369,7 +369,7 @@ BOOL LLFavoritesBarCtrl::postBuild()
 	{
 		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
-	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
+	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
 	mInventoryItemsPopupMenuHandle = menu->getHandle();
 
 	return TRUE;
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 35613b7c34..b8e2840fe6 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -434,7 +434,6 @@ void LLFeatureManager::applyRecommendedSettings()
 
 	setGraphicsLevel(level, false);
 	gSavedSettings.setU32("RenderQualityPerformance", level);
-	gSavedSettings.setBOOL("RenderCustomSettings", FALSE);
 
 	// now apply the tweaks to draw distance
 	// these are double negatives, because feature masks only work by
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 9df0a96888..bdd34dfca8 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -106,7 +106,7 @@ BOOL LLFloaterAbout::postBuild()
 	viewer_link_style->setVisible(true);
 	viewer_link_style->setFontName(LLStringUtil::null);
 	viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
-	viewer_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+	viewer_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 
 	// Version string
 	std::string version = LLTrans::getString("SECOND_LIFE_VIEWER")
@@ -114,7 +114,7 @@ BOOL LLFloaterAbout::postBuild()
 				   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
 				   __DATE__, __TIME__,
 				   gSavedSettings.getString("VersionChannelName").c_str());
-	support_widget->appendColoredText(version, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+	support_widget->appendColoredText(version, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
 
 	std::string support;
@@ -136,7 +136,7 @@ BOOL LLFloaterAbout::postBuild()
 		server_link_style->setVisible(true);
 		server_link_style->setFontName(LLStringUtil::null);
 		server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
-		server_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+		server_link_style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 
 		const LLVector3d &pos = gAgent.getPositionGlobal();
 		LLUIString pos_text = getString("you_are_at");
@@ -158,7 +158,7 @@ BOOL LLFloaterAbout::postBuild()
 		support.append(gLastVersionChannel);
 		support.append("\n");
 
-		support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+		support_widget->appendColoredText(support, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 		support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
 
 		support = "\n\n";
@@ -246,7 +246,7 @@ BOOL LLFloaterAbout::postBuild()
 		support.append(getString ("PacketsLost", args) + "\n");
 	}
 
-	support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
+	support_widget->appendColoredText(support, FALSE, FALSE, LLUIColorTable::instance().getColor("TextFgReadOnlyColor"));
 
 	// Fix views
 	support_widget->setCursorPos(0);
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 61ef3abda6..5250c798f9 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -368,11 +368,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
 		F32 size = CHAT_MSG_SIZE;
 		if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
 		{
-			text_color = gSavedSkinSettings.getColor("SystemChatColor");
+			text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 		}
 		else if(from_instant_message)
 		{
-			text_color = gSavedSkinSettings.getColor("IMChatColor");
+			text_color = LLUIColorTable::instance().getColor("IMChatColor");
 			size = INSTANT_MSG_SIZE;
 		}
 		// We display anything if it's not an IM. If it's an IM, check pref...
@@ -453,37 +453,37 @@ LLColor4 get_text_color(const LLChat& chat)
 		switch(chat.mSourceType)
 		{
 		case CHAT_SOURCE_SYSTEM:
-			text_color = gSavedSkinSettings.getColor4("SystemChatColor");
+			text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 			break;
 		case CHAT_SOURCE_AGENT:
 		    if (chat.mFromID.isNull())
 			{
-				text_color = gSavedSkinSettings.getColor4("SystemChatColor");
+				text_color = LLUIColorTable::instance().getColor("SystemChatColor");
 			}
 			else
 			{
 				if(gAgent.getID() == chat.mFromID)
 				{
-					text_color = gSavedSkinSettings.getColor4("UserChatColor");
+					text_color = LLUIColorTable::instance().getColor("UserChatColor");
 				}
 				else
 				{
-					text_color = gSavedSkinSettings.getColor4("AgentChatColor");
+					text_color = LLUIColorTable::instance().getColor("AgentChatColor");
 				}
 			}
 			break;
 		case CHAT_SOURCE_OBJECT:
 			if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
 			{
-				text_color = gSavedSkinSettings.getColor4("ScriptErrorColor");
+				text_color = LLUIColorTable::instance().getColor("ScriptErrorColor");
 			}
 			else if ( chat.mChatType == CHAT_TYPE_OWNER )
 			{
-				text_color = gSavedSkinSettings.getColor4("llOwnerSayChatColor");
+				text_color = LLUIColorTable::instance().getColor("llOwnerSayChatColor");
 			}
 			else
 			{
-				text_color = gSavedSkinSettings.getColor4("ObjectChatColor");
+				text_color = LLUIColorTable::instance().getColor("ObjectChatColor");
 			}
 			break;
 		default:
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 4964f04556..edc96715cd 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -173,7 +173,7 @@ void LLFloaterColorPicker::createUI ()
 
 		// argh!
 		const std::string s ( codec.str () );
-		mPalette.push_back ( new LLColor4 ( gSavedSkinSettings.getColor4 ( s )  ) );
+		mPalette.push_back ( new LLColor4 ( LLUIColorTable::instance().getColor ( s )  ) );
 	}
 }
 
@@ -1017,7 +1017,7 @@ BOOL LLFloaterColorPicker::handleMouseUp ( S32 x, S32 y, MASK mask )
 							std::ostringstream codec;
 							codec << "ColorPaletteEntry" << std::setfill ( '0' ) << std::setw ( 2 ) << curEntry + 1;
 							const std::string s ( codec.str () );
-							gSavedSkinSettings.setColor4( s, *mPalette [ curEntry ] );
+							LLUIColorTable::instance().setColor(s, *mPalette [ curEntry ] );
 						}
 					}
 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 15d57ebbcc..6834af4fd5 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -45,6 +45,7 @@
 #include "llagent.h"
 #include "llavatarconstants.h"
 #include "llcheckboxctrl.h"
+#include "llcolorswatch.h"
 #include "llcombobox.h"
 #include "llcommandhandler.h"
 #include "lldirpicker.h"
@@ -332,7 +333,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.LogPath",				boost::bind(&LLFloaterPreference::onClickLogPath, this));
 	mCommitCallbackRegistrar.add("Pref.Logging",				boost::bind(&LLFloaterPreference::onCommitLogging, this));
 	mCommitCallbackRegistrar.add("Pref.OpenHelp",				boost::bind(&LLFloaterPreference::onOpenHelp, this));	
-	mCommitCallbackRegistrar.add("Pref.ChangeCustom",			boost::bind(&LLFloaterPreference::onChangeCustom, this));	
 	mCommitCallbackRegistrar.add("Pref.UpdateMeterText",		boost::bind(&LLFloaterPreference::updateMeterText, this, _1));	
 	mCommitCallbackRegistrar.add("Pref.HardwareSettings",       boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));	
 	mCommitCallbackRegistrar.add("Pref.HardwareDefaults",       boost::bind(&LLFloaterPreference::setHardwareDefaults, this));	
@@ -342,8 +342,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.AutoDetectAspect",       boost::bind(&LLFloaterPreference::onCommitAutoDetectAspect, this));	
 	mCommitCallbackRegistrar.add("Pref.onSelectAspectRatio",    boost::bind(&LLFloaterPreference::onKeystrokeAspectRatio, this));	
 	mCommitCallbackRegistrar.add("Pref.QualityPerformance",     boost::bind(&LLFloaterPreference::onChangeQuality, this, _2));	
-	
-	gSavedSkinSettings.getControl("HTMLLinkColor")->getCommitSignal()->connect(boost::bind(&handleHTMLLinkColorChanged,  _2));
 
 }
 
@@ -459,7 +457,7 @@ void LLFloaterPreference::apply()
 	applyResolution();
 	
 	// Only set window size if we're not in fullscreen mode
-	if(gSavedSettings.getBOOL("NotFullScreen"))
+	if(!gSavedSettings.getBOOL("WindowFullScreen"))
 	{
 		applyWindowSize();
 	}
@@ -544,7 +542,7 @@ void LLFloaterPreference::onBtnOK()
 		apply();
 		closeFloater(false);
 		gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
-		gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+		LLUIColorTable::instance().saveUserSettings();
 		std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
 		// save all settings, even if equals defaults
 		gCrashSettings.saveToFile(crash_settings_filename, FALSE);
@@ -605,19 +603,6 @@ void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_
 }
 
 
-void LLFloaterPreference::onChangeCustom()
-{
-	// if custom is turned off, reset everything to defaults
-	if (this && getChild<LLCheckBoxCtrl>("CustomSettings")->getValue())
-	{
-		U32 set = (U32)getChild<LLSliderCtrl>("QualityPerformanceSelection")->getValueF32();
-		LLFeatureManager::getInstance()->setGraphicsLevel(set, true);	
-		updateMeterText(getChild<LLSliderCtrl>("DrawDistance"));
-	}
-
-	refreshEnabledGraphics();
-}
-
 void LLFloaterPreference::refreshEnabledGraphics()
 {
 	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
@@ -781,12 +766,6 @@ void LLFloaterPreference::buildLists(void* data)
 void LLFloaterPreference::refreshEnabledState()
 {
 	
-	// disable graphics settings and exit if it's not set to custom
-	if(!gSavedSettings.getBOOL("RenderCustomSettings"))
-	{
-		return;
-	}
-	
 	LLCheckBoxCtrl* ctrl_reflections = getChild<LLCheckBoxCtrl>("Reflections");
 	LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
 	
@@ -1249,7 +1228,7 @@ void LLFloaterPreference::applyResolution()
 	gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth);
 	gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight);
 	
-	gViewerWindow->requestResolutionUpdate(!gSavedSettings.getBOOL("NotFullScreen"));
+	gViewerWindow->requestResolutionUpdate(gSavedSettings.getBOOL("WindowFullScreen"));
 	
 	send_agent_update(TRUE);
 	
@@ -1298,6 +1277,12 @@ LLPanelPreference::LLPanelPreference()
 	//
 	mCommitCallbackRegistrar.add("setControlFalse",		boost::bind(&LLPanelPreference::setControlFalse,this, _2));
 }
+
+static void applyUIColor(const std::string& color_name, LLUICtrl* ctrl, const LLSD& param)
+{
+	LLUIColorTable::instance().setColor(color_name, LLColor4(param));
+}
+
 //virtual
 BOOL LLPanelPreference::postBuild()
 {
@@ -1460,6 +1445,55 @@ BOOL LLPanelPreference::postBuild()
 		refresh();
 	}
 	
+
+	if(hasChild("user") && hasChild("agent") && hasChild("im") 
+	&& hasChild("system") && hasChild("script_error") && hasChild("objects") 
+	&& hasChild("owner") && hasChild("background") && hasChild("links"))
+	{
+		LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("user");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "UserChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("UserChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("agent");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "AgentChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("AgentChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("im");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "IMChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("IMChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("system");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "SystemChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("SystemChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("script_error");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "ScriptErrorColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("ScriptErrorColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("objects");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "ObjectChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("ObjectChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("owner");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "llOwnerSayChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("llOwnerSayChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("background");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "BackgroundChatColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("BackgroundChatColor"));
+
+		color_swatch = getChild<LLColorSwatchCtrl>("links");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "HTMLLinkColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("HTMLLinkColor"));
+	}
+
+	if(hasChild("effect_color_swatch"))
+	{
+		LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("effect_color_swatch");
+		color_swatch->setCommitCallback(boost::bind(&applyUIColor, "EffectColor", _1, _2));
+		color_swatch->setOriginal(LLUIColorTable::instance().getColor("EffectColor"));
+	}
+
 	apply();
 	return true;
 }
@@ -1475,16 +1509,25 @@ void LLPanelPreference::apply()
 		// Process view on top of the stack
 		LLView* curview = view_stack.front();
 		view_stack.pop_front();
-		LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
-		if (ctrl)
+
+		LLColorSwatchCtrl* color_swatch = dynamic_cast<LLColorSwatchCtrl *>(curview);
+		if (color_swatch)
+		{
+			mSavedColors[color_swatch->getName()] = color_swatch->get();
+		}
+		else
 		{
-			LLControlVariable* control = ctrl->getControlVariable();
-			if (control)
+			LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+			if (ctrl)
 			{
-				mSavedValues[control] = control->getValue();
+				LLControlVariable* control = ctrl->getControlVariable();
+				if (control)
+				{
+					mSavedValues[control] = control->getValue();
+				}
 			}
 		}
-		
+			
 		// Push children onto the end of the work stack
 		for (child_list_t::const_iterator iter = curview->getChildList()->begin();
 			 iter != curview->getChildList()->end(); ++iter)
@@ -1504,6 +1547,17 @@ void LLPanelPreference::cancel()
 		LLSD ctrl_value = iter->second;
 		control->set(ctrl_value);
 	}
+
+	for (string_color_map_t::iterator iter = mSavedColors.begin();
+		 iter != mSavedColors.end(); ++iter)
+	{
+		LLColorSwatchCtrl* color_swatch = findChild<LLColorSwatchCtrl>(iter->first);
+		if(color_swatch)
+		{
+			color_swatch->set(iter->second);
+			color_swatch->onCommit();
+		}
+	}
 }
 
 void LLPanelPreference::setControlFalse(const LLSD& user_data)
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index afff610c69..cf2ccdce6d 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -163,6 +163,9 @@ public:
 private:
 	typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
 	control_values_map_t mSavedValues;
+
+	typedef std::map<std::string, LLColor4> string_color_map_t;
+	string_color_map_t mSavedColors;
 };
 
 #endif  // LL_LLPREFERENCEFLOATER_H
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 8b6102c67f..53b40f8b7a 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -80,10 +80,6 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	{
 		gSavedPerAccountSettings.applyToAll(&func);
 	}
-	if (key == "all" || key == "skin")
-	{
-		gSavedSkinSettings.applyToAll(&func);
-	}
 
 	settings_combo->sortByName();
 	settings_combo->updateSelection();
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index cb4f2a6711..fef0474062 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1297,7 +1297,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 	floater->childSetColor("file_size_label", 
 		shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 
 		&& got_bytes
-		&& previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLColor4::red : LLUI::sSettingGroups["color"]->getColor( "LabelTextColor" ));
+		&& previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLUIColor(LLColor4::red) : LLUIColorTable::instance().getColor( "LabelTextColor" ));
 
 	switch(shot_type)
 	{
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index 12d12f37f2..16f4ecef07 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -113,7 +113,7 @@ void LLPanelVoiceDeviceSettings::draw()
 			{
 				if (power_bar_idx < discrete_power)
 				{
-					LLColor4 color = (power_bar_idx >= 3) ? gSavedSkinSettings.getColor4("OverdrivenColor") : gSavedSkinSettings.getColor4("SpeakingColor");
+					LLColor4 color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor");
 					gl_rect_2d(bar_view->getRect(), color, TRUE);
 				}
 				gl_rect_2d(bar_view->getRect(), LLColor4::grey, FALSE);
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 2fe817625a..9711e02f69 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -387,8 +387,8 @@ void LLFloaterWorldMap::reshape( S32 width, S32 height, BOOL called_from_parent
 // virtual
 void LLFloaterWorldMap::draw()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
 	
 	// Hide/Show Mature Events controls
 	childSetVisible("events_mature_icon", gAgent.canAccessMature());
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index fd8c22b8e5..ebda8b25fd 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -793,13 +793,13 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 void LLFolderViewItem::draw()
 {
-	static LLCachedControl<LLColor4> sFgColor(gSavedSkinSettings, "MenuItemEnabledColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sHighlightBgColor(gSavedSkinSettings, "MenuItemHighlightBgColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sHighlightFgColor(gSavedSkinSettings, "MenuItemHighlightFgColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sFilterBGColor(gSavedSkinSettings, "FilterBackgroundColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sFilterTextColor(gSavedSkinSettings, "FilterTextColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sSuffixColor(gSavedSkinSettings, "InventoryItemSuffixColor", DEFAULT_WHITE);
-	static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
+	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
+	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
+	static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 
 	bool possibly_has_children = false;
 	bool up_to_date = mListener && mListener->isUpToDate();
@@ -2562,7 +2562,7 @@ LLFolderView::LLFolderView(const Params& p)
 	{
 		menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu");
 	}
-	menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
+	menu->setBackgroundColor(LLUIColorTable::instance().getColor("MenuPopupBgColor"));
 	mPopupMenuHandle = menu->getHandle();
 
 }
@@ -3148,7 +3148,7 @@ void LLFolderView::commitRename( const LLSD& data )
 
 void LLFolderView::draw()
 {
-	static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
+	static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
 	if (mDebugFilters)
 	{
 		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
index e1e9d9c51e..8588de0fa0 100644
--- a/indra/newview/llhudmanager.cpp
+++ b/indra/newview/llhudmanager.cpp
@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llhudeffect.h"
 #include "pipeline.h"
+#include "llui.h"
 #include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
 
@@ -52,9 +53,9 @@ LLColor4 LLHUDManager::sChildColor;
 LLHUDManager::LLHUDManager()
 {
 
-	LLHUDManager::sParentColor = gSavedSkinSettings.getColor("FocusColor");
+	LLHUDManager::sParentColor = LLUIColorTable::instance().getColor("FocusColor");
 	// rdw commented out since it's not used.  Also removed from colors_base.xml
-	//LLHUDManager::sChildColor =gSavedSkinSettings.getColor("FocusSecondaryColor");
+	//LLHUDManager::sChildColor =LLUIColorTable::instance().getColor("FocusSecondaryColor");
 }
 
 LLHUDManager::~LLHUDManager()
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index efeac9c197..abb3acd974 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -292,7 +292,7 @@ void LLHUDText::renderText(BOOL for_select)
 	LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
 
 	// *TODO: make this a per-text setting
-	LLColor4 bg_color = gSavedSkinSettings.getColor4("BackgroundChatColor");
+	LLColor4 bg_color = LLUIColorTable::instance().getColor("BackgroundChatColor");
 	bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor);
 
 	const S32 border_height = 16;
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 6acd174fc3..fbf990e1af 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1222,7 +1222,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(const std::string& session_label,
 
 			addHistoryLine(
 				session_start,
-				gSavedSkinSettings.getColor4("SystemChatColor"),
+				LLUIColorTable::instance().getColor("SystemChatColor"),
 				false);
 		}
 	}
@@ -2004,7 +2004,7 @@ void LLFloaterIMPanel::sendMsg()
 
 					BOOL other_was_typing = mOtherTyping;
 
-					addHistoryLine(history_echo, gSavedSkinSettings.getColor("IMChatColor"), true, gAgent.getID());
+					addHistoryLine(history_echo, LLUIColorTable::instance().getColor("IMChatColor"), true, gAgent.getID());
 
 					if (other_was_typing) 
 					{
@@ -2175,7 +2175,7 @@ void LLFloaterIMPanel::addTypingIndicator(const std::string &name)
 		mTypingLineStartIndex = mHistoryEditor->getWText().length();
 		LLUIString typing_start = sTypingStartString;
 		typing_start.setArg("[NAME]", name);
-		addHistoryLine(typing_start, gSavedSkinSettings.getColor4("SystemChatColor"), false);
+		addHistoryLine(typing_start, LLUIColorTable::instance().getColor("SystemChatColor"), false);
 		mOtherTypingName = name;
 		mOtherTyping = TRUE;
 	}
@@ -2232,7 +2232,7 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string
 	}
 
 	//self->addHistoryLine(line, LLColor4::grey, FALSE);
-	self->mHistoryEditor->appendColoredText(message, false, true, gSavedSkinSettings.getColor4("ChatHistoryTextColor"));
+	self->mHistoryEditor->appendColoredText(message, false, true, LLUIColorTable::instance().getColor("ChatHistoryTextColor"));
 }
 
 void LLFloaterIMPanel::showSessionStartError(
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d6569663a2..bc98b609ec 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -745,7 +745,7 @@ void LLIMMgr::addMessage(
 			//<< "*** region_id: " << region_id << std::endl
 			//<< "*** position: " << position << std::endl;
 
-			floater->addHistoryLine(bonus_info.str(), gSavedSkinSettings.getColor4("SystemChatColor"));
+			floater->addHistoryLine(bonus_info.str(), LLUIColorTable::instance().getColor("SystemChatColor"));
 		}
 
 		make_ui_sound("UISndNewIncomingIMSession");
@@ -754,8 +754,8 @@ void LLIMMgr::addMessage(
 	// now add message to floater
 	bool is_from_system = target_id.isNull() || (from == SYSTEM_FROM);
 	const LLColor4& color = ( is_from_system ? 
-							  gSavedSkinSettings.getColor4("SystemChatColor") : 
-							  gSavedSkinSettings.getColor("IMChatColor"));
+							  LLUIColorTable::instance().getColor("SystemChatColor") : 
+							  LLUIColorTable::instance().getColor("IMChatColor"));
 	if ( !link_name )
 	{
 		floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally
@@ -1332,7 +1332,7 @@ void LLIMMgr::noteOfflineUsers(
 	S32 count = ids.count();
 	if(count == 0)
 	{
-		floater->addHistoryLine(sOnlyUserMessage, gSavedSkinSettings.getColor4("SystemChatColor"));
+		floater->addHistoryLine(sOnlyUserMessage, LLUIColorTable::instance().getColor("SystemChatColor"));
 	}
 	else
 	{
@@ -1348,7 +1348,7 @@ void LLIMMgr::noteOfflineUsers(
 				LLUIString offline = sOfflineMessage;
 				offline.setArg("[FIRST]", first);
 				offline.setArg("[LAST]", last);
-				floater->addHistoryLine(offline, gSavedSkinSettings.getColor4("SystemChatColor"));
+				floater->addHistoryLine(offline, LLUIColorTable::instance().getColor("SystemChatColor"));
 			}
 		}
 	}
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index fac0de0f33..2cee9de1eb 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -174,8 +174,7 @@ LLLocationInputCtrl::Params::Params()
 	add_landmark_image_disabled("add_landmark_image_disabled"),
 	add_landmark_button("add_landmark_button"),
 	add_landmark_hpad("add_landmark_hpad", 0),
-	info_button("info_button"),
-	background("background")
+	info_button("info_button")
 {
 }
 
@@ -185,11 +184,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mInfoBtn(NULL),
 	mAddLandmarkBtn(NULL)
 {
-	// Background image.
-	LLButton::Params bg_params = p.background;
-	mBackground = LLUICtrlFactory::create<LLButton>(bg_params);
-	addChildInBack(mBackground);
-
 	// "Place information" button.
 	LLButton::Params info_params = p.info_button;
 	mInfoBtn = LLUICtrlFactory::create<LLButton>(info_params);
@@ -213,8 +207,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	enableAddLandmarkButton(true);
 	addChild(mAddLandmarkBtn);
 	
-	setFocusReceivedCallback(boost::bind(&LLLocationInputCtrl::onFocusReceived, this));
-	setFocusLostCallback(boost::bind(&LLLocationInputCtrl::onFocusLost, this));
 	setPrearrangeCallback(boost::bind(&LLLocationInputCtrl::onLocationPrearrange, this, _2));
 
 	updateWidgetlayout();
@@ -354,6 +346,7 @@ void LLLocationInputCtrl::onFocusReceived()
 
 void LLLocationInputCtrl::onFocusLost()
 {
+	LLUICtrl::onFocusLost();
 	refreshLocation();
 }
 
@@ -462,7 +455,6 @@ void LLLocationInputCtrl::enableAddLandmarkButton(bool val)
 void LLLocationInputCtrl::updateAddLandmarkButton()
 {
 	bool cur_parcel_landmarked = false;
-
 	// Determine whether there are landmarks pointing to the current parcel.
 	LLInventoryModel::cat_array_t cats;
 	LLInventoryModel::item_array_t items;
@@ -481,21 +473,14 @@ void LLLocationInputCtrl::updateWidgetlayout()
 {
 	const LLRect&	rect			= getLocalRect();
 	const LLRect&	hist_btn_rect	= mButton->getRect();
-	LLRect			info_btn_rect	= mButton->getRect();
+	LLRect			info_btn_rect	= mInfoBtn->getRect();
 
 	// info button
 	info_btn_rect.setOriginAndSize(
-		0, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
+		2, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
 		info_btn_rect.getWidth(), info_btn_rect.getHeight());
 	mInfoBtn->setRect(info_btn_rect);
 
-	// background
-	mBackground->setRect(LLRect(info_btn_rect.getWidth(), rect.mTop,
-		rect.mRight - hist_btn_rect.getWidth(), rect.mBottom));
-
-	// history button
-	mButton->setRightHPad(0);
-
 	// "Add Landmark" button
 	{
 		LLRect al_btn_rect = mAddLandmarkBtn->getRect();
@@ -504,14 +489,4 @@ void LLLocationInputCtrl::updateWidgetlayout()
 			(rect.getHeight() - al_btn_rect.getHeight()) / 2);
 		mAddLandmarkBtn->setRect(al_btn_rect);
 	}
-
-	// text entry
-	if (mTextEntry)
-	{
-		LLRect text_entry_rect(rect);
-		text_entry_rect.mLeft = info_btn_rect.getWidth();
-		text_entry_rect.mRight = mAddLandmarkBtn->getRect().mLeft;
-		text_entry_rect.stretch(0, -1); // make space for border
-		mTextEntry->setRect(text_entry_rect);
-	}
 }
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index 1732853263..0a863f6dd8 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -61,8 +61,7 @@ public:
 											add_landmark_image_disabled;
 		Optional<S32>						add_landmark_hpad;
 		Optional<LLButton::Params>			add_landmark_button,
-											info_button,
-											background;
+											info_button;
 		Params();
 	};
 
@@ -70,6 +69,8 @@ public:
 	/*virtual*/ void		setEnabled(BOOL enabled);
 	/*virtual*/ BOOL		handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	/*virtual*/ BOOL		handleKeyHere(KEY key, MASK mask);
+	/*virtual*/ void		onFocusReceived();
+	/*virtual*/ void		onFocusLost();
 	//========================================================================
 
 	// LLUICtrl interface
@@ -98,8 +99,6 @@ private:
 	void					updateAddLandmarkButton();
 	void					updateWidgetlayout();
 
-	void					onFocusReceived();
-	void					onFocusLost();
 	void					onInfoButtonClicked();
 	void					onLocationHistoryLoaded();
 	void					onLocationPrearrange(const LLSD& data);
@@ -107,7 +106,6 @@ private:
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
 
-	LLButton*				mBackground;
 	LLButton*				mAddLandmarkBtn;
 	LLButton*				mInfoBtn;
 	S32						mAddLandmarkHPad;
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 7039776585..062e781d49 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -581,9 +581,9 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string
 
 LLColor4 LLManip::setupSnapGuideRenderPass(S32 pass)
 {
-	static LLColor4 grid_color_fg = gSavedSkinSettings.getColor("GridlineColor");
-	static LLColor4 grid_color_bg = gSavedSkinSettings.getColor("GridlineBGColor");
-	static LLColor4 grid_color_shadow = gSavedSkinSettings.getColor("GridlineShadowColor");
+	static LLColor4 grid_color_fg = LLUIColorTable::instance().getColor("GridlineColor");
+	static LLColor4 grid_color_bg = LLUIColorTable::instance().getColor("GridlineBGColor");
+	static LLColor4 grid_color_shadow = LLUIColorTable::instance().getColor("GridlineShadowColor");
 
 	LLColor4 line_color;
 	F32 line_alpha = gSavedSettings.getF32("GridOpacity");
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index f228ea624b..d1d112c4bf 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -1107,8 +1107,8 @@ BOOL LLManipRotate::updateVisiblity()
 		mCenterToProfilePlaneMag = mRadiusMeters * mRadiusMeters / mCenterToCamMag;
 		mCenterToProfilePlane = -mCenterToProfilePlaneMag * mCenterToCamNorm;
 
-		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.mHUDCurZoom * gViewerWindow->getWindowWidth()),
-							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.mHUDCurZoom * gViewerWindow->getWindowHeight()));
+		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.mHUDCurZoom * gViewerWindow->getWorldViewWidth()),
+							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.mHUDCurZoom * gViewerWindow->getWorldViewHeight()));
 		visible = TRUE;
 	}
 	else
@@ -1624,8 +1624,8 @@ void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_
 {
 	if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.mHUDCurZoom;
-		F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.mHUDCurZoom;
+		F32 mouse_x = (((F32)x / gViewerWindow->getWorldViewWidth()) - 0.5f) / gAgent.mHUDCurZoom;
+		F32 mouse_y = ((((F32)y) / gViewerWindow->getWorldViewHeight()) - 0.5f) / gAgent.mHUDCurZoom;
 
 		*ray_pt = LLVector3(-1.f, -mouse_x, mouse_y);
 		*ray_dir = LLVector3(1.f, 0.f, 0.f);
@@ -1699,7 +1699,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 	F32 dist_y = mouse_dir_y.normVec();
 	F32 dist_z = mouse_dir_z.normVec();
 
-	F32 distance_threshold = (MAX_MANIP_SELECT_DISTANCE * mRadiusMeters) / gViewerWindow->getWindowHeight();
+	F32 distance_threshold = (MAX_MANIP_SELECT_DISTANCE * mRadiusMeters) / gViewerWindow->getWorldViewHeight();
 
 	if (llabs(dist_x - mRadiusMeters) * llmax(0.05f, proj_rot_x_axis) < distance_threshold)
 	{
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 5261c130ea..72596e850a 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -493,8 +493,8 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
 			mProjectedManipulators.insert(projManipulator);
 		}
 
-		F32 half_width = (F32)gViewerWindow->getWindowWidth() / 2.f;
-		F32 half_height = (F32)gViewerWindow->getWindowHeight() / 2.f;
+		F32 half_width = (F32)gViewerWindow->getWorldViewWidth() / 2.f;
+		F32 half_height = (F32)gViewerWindow->getWorldViewHeight() / 2.f;
 		LLVector2 manip2d;
 		LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
 		LLVector2 delta;
@@ -1368,7 +1368,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 	else
 	{
 		F32 object_distance = dist_vec(mScaleCenter, LLViewerCamera::getInstance()->getOrigin());
-		mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWindowWidth() * object_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
+		mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWorldViewWidth() * object_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	}
 	LLVector3 cam_at_axis;
 	F32 snap_guide_length;
@@ -1381,7 +1381,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 	{
 		cam_at_axis = LLViewerCamera::getInstance()->getAtAxis();
 		F32 manipulator_distance = dist_vec(box_corner_agent, LLViewerCamera::getInstance()->getOrigin());
-		snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWindowWidth() * manipulator_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
+		snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWorldViewWidth() * manipulator_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	}
 	
 	mSnapGuideLength = snap_guide_length / llmax(0.1f, (llmin(mSnapGuideDir1 * cam_at_axis, mSnapGuideDir2 * cam_at_axis)));
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index b8c2a3d64b..3a1ffd6546 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -414,7 +414,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 	
 	// Handle auto-rotation if necessary.
 	const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
-	const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
+	const S32 ROTATE_H_MARGIN = gViewerWindow->getWorldViewWidth() / 20;
 	const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
 	BOOL rotated = FALSE;
 
@@ -426,7 +426,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 			gAgent.cameraOrbitAround(rotate_angle);
 			rotated = TRUE;
 		}
-		else if (x > gViewerWindow->getWindowWidth() - ROTATE_H_MARGIN)
+		else if (x > gViewerWindow->getWorldViewWidth() - ROTATE_H_MARGIN)
 		{
 			gAgent.cameraOrbitAround(-rotate_angle);
 			rotated = TRUE;
@@ -960,8 +960,8 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
 	LLVector2 manip_start_2d;
 	LLVector2 manip_end_2d;
 	LLVector2 manip_dir;
-	F32 half_width = gViewerWindow->getWindowWidth() / 2.f;
-	F32 half_height = gViewerWindow->getWindowHeight() / 2.f;
+	F32 half_width = gViewerWindow->getWorldViewWidth() / 2.f;
+	F32 half_height = gViewerWindow->getWorldViewHeight() / 2.f;
 	LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
 	LLVector2 mouse_delta;
 
@@ -1225,7 +1225,7 @@ void LLManipTranslate::renderSnapGuides()
 		{
 			LLVector3 cam_to_selection = getPivotPoint() - LLViewerCamera::getInstance()->getOrigin();
 			F32 current_range = cam_to_selection.normVec();
-			guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWindowHeight() * current_range / LLViewerCamera::getInstance()->getPixelMeterRatio();
+			guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWorldViewHeight() * current_range / LLViewerCamera::getInstance()->getPixelMeterRatio();
 	
 			F32 fraction_of_fov = mAxisArrowLength / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
 			F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
@@ -1522,7 +1522,7 @@ void LLManipTranslate::renderSnapGuides()
 		
 		float a = line_alpha;
 
-		LLColor4 col = gSavedSkinSettings.getColor("SilhouetteChildColor");
+		LLColor4 col = LLUIColorTable::instance().getColor("SilhouetteChildColor");
 		{
 			//draw grid behind objects
 			LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -1800,7 +1800,7 @@ void LLManipTranslate::renderTranslationHandles()
 	// Drag handles 	
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWindowHeight();
+		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWorldViewHeight();
 		mArrowLengthMeters /= gAgent.mHUDCurZoom;
 	}
 	else
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp
index ab5db93027..3c7716e9c2 100644
--- a/indra/newview/llmemoryview.cpp
+++ b/indra/newview/llmemoryview.cpp
@@ -119,7 +119,7 @@ void LLMemoryView::draw()
 	const S32 UPDATE_INTERVAL = 60;
 	const S32 MARGIN_AMT = 10; 
 	static S32 curUpdate = UPDATE_INTERVAL;
-    static LLCachedControl<LLColor4> s_console_color(gSavedSkinSettings, "ConsoleBackground", LLColor4U::black);	
+    static LLUIColor s_console_color = LLUIColorTable::instance().getColor("ConsoleBackground", LLColor4U::black);	
 
 	// setup update interval
 	if (curUpdate >= UPDATE_INTERVAL)
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index b40af37f7e..1f623af434 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -112,12 +112,12 @@ void LLNetMap::translatePan( F32 delta_x, F32 delta_y )
 void LLNetMap::draw()
 {
  	static LLFrameTimer map_timer;
-	static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_frustum_color(gSavedSkinSettings, "MapFrustumColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_frustum_rotating_color(gSavedSkinSettings, "MapFrustumRotatingColor", LLColor4::white);
+	static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white);
+	static LLUIColor map_avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
+	static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
+	static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
 	
 	if (mObjectImagep.isNull())
 	{
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index ff26707a56..196a86b29c 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -55,10 +55,10 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
 	mPower(0),
 	mIsMuted(true)
 {
-	static LLUICachedControl<LLColor4> output_monitor_muted_color("OutputMonitorMutedColor", LLColor4::orange);
-	static LLUICachedControl<LLColor4> output_monitor_overdriven_color("OutputMonitorOverdrivenColor", LLColor4::red);
-	static LLUICachedControl<LLColor4> output_monitor_normal_color("OutputMonitorNotmalColor", LLColor4::green);
-	static LLUICachedControl<LLColor4> output_monitor_bound_color("OutputMonitorBoundColor", LLColor4::white);
+	static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
+	static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
+	static LLUIColor output_monitor_normal_color = LLUIColorTable::instance().getColor("OutputMonitorNotmalColor", LLColor4::green);
+	static LLUIColor output_monitor_bound_color = LLUIColorTable::instance().getColor("OutputMonitorBoundColor", LLColor4::white);
 	static LLUICachedControl<S32> output_monitor_rects_number("OutputMonitorRectanglesNumber", 20);
 	static LLUICachedControl<F32> output_monitor_rect_width_ratio("OutputMonitorRectangleWidthRatio", 0.5f);
 	static LLUICachedControl<F32> output_monitor_rect_height_ratio("OutputMonitorRectangleHeightRatio", 0.8f);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index ed7c7dce12..baa5f34849 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -187,12 +187,12 @@ LLSelectMgr::LLSelectMgr()
 	sHighlightUAnim		= gSavedSettings.getF32("SelectionHighlightUAnim");
 	sHighlightVAnim		= gSavedSettings.getF32("SelectionHighlightVAnim");
 
-	sSilhouetteParentColor =gSavedSkinSettings.getColor("SilhouetteParentColor");
-	sSilhouetteChildColor = gSavedSkinSettings.getColor("SilhouetteChildColor");
-	sHighlightParentColor = gSavedSkinSettings.getColor("HighlightParentColor");
-	sHighlightChildColor = gSavedSkinSettings.getColor("HighlightChildColor");
-	sHighlightInspectColor = gSavedSkinSettings.getColor("HighlightInspectColor");
-	sContextSilhouetteColor = gSavedSkinSettings.getColor("ContextSilhouetteColor")*0.5f;
+	sSilhouetteParentColor =LLUIColorTable::instance().getColor("SilhouetteParentColor");
+	sSilhouetteChildColor = LLUIColorTable::instance().getColor("SilhouetteChildColor");
+	sHighlightParentColor = LLUIColorTable::instance().getColor("HighlightParentColor");
+	sHighlightChildColor = LLUIColorTable::instance().getColor("HighlightChildColor");
+	sHighlightInspectColor = LLUIColorTable::instance().getColor("HighlightInspectColor");
+	sContextSilhouetteColor = LLUIColorTable::instance().getColor("ContextSilhouetteColor")*0.5f;
 
 	sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
 	
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index daee3ecfa6..2871b16f5c 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -162,8 +162,8 @@ BOOL LLSideTrayTab::postBuild()
 	
 	title_panel->getChild<LLTextBox>(TAB_PANEL_CAPTION_TITLE_BOX)->setValue(mTabTitle);
 
-	static LLUICachedControl<LLColor4> default_background_color ("FloaterDefaultBackgroundColor", *(new LLColor4));
-	static LLUICachedControl<LLColor4> focus_background_color ("FloaterFocusBackgroundColor", *(new LLColor4));
+	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
+	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
 	
 	setTransparentColor(default_background_color);
 	setBackgroundColor(focus_background_color);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d287f25181..790669c07f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -469,13 +469,24 @@ bool idle_startup()
 		
 		#if LL_WINDOWS
 			// On the windows dev builds, unpackaged, the message_template.msg 
-			// file will be located in 
-			// indra/build-vc**/newview/<config>/app_settings.
+			// file will be located in:
+			// build-vc**/newview/<config>/app_settings
 			if (!found_template)
 			{
 				message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");
 				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
 			}	
+		#elif LL_DARWIN
+			// On Mac dev builds, message_template.msg lives in:
+			// indra/build-*/newview/<config>/Second Life/Contents/Resources/app_settings
+			if (!found_template)
+			{
+				message_template_path =
+					gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE,
+												   "../Resources/app_settings",
+												   "message_template.msg");
+				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
+			}		
 		#endif
 
 		if (found_template)
@@ -929,7 +940,7 @@ bool idle_startup()
 
 		
 		//For HTML parsing in text boxes.
-		LLTextEditor::setLinkColor( gSavedSkinSettings.getColor4("HTMLLinkColor") );
+		LLTextEditor::setLinkColor( LLUIColorTable::instance().getColor("HTMLLinkColor") );
 
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
@@ -1604,7 +1615,7 @@ bool idle_startup()
 		// Since we connected, save off the settings so the user doesn't have to
 		// type the name/password again if we crash.
 		gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
-		gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+		LLUIColorTable::instance().saveUserSettings();
 
 		//
 		// Initialize classes w/graphics stuff.
@@ -2187,7 +2198,7 @@ bool idle_startup()
 
 			// and make sure it's saved
 			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+			LLUIColorTable::instance().saveUserSettings();
 		};
 
 		if (!gNoRender)
@@ -2576,7 +2587,7 @@ void login_callback(S32 option, void *userdata)
 		{
 			// turn off the setting and write out to disk
 			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
+			LLUIColorTable::instance().saveUserSettings();
 		}
 
 		// Next iteration through main loop should shut down the app cleanly.
@@ -2786,7 +2797,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 {
 	// store off config state, as we might quit soon
 	gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);	
-	gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+	LLUIColorTable::instance().saveUserSettings();
 	std::ostringstream message;
 
 	std::string msg;
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 8c2372ee74..58af603569 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -237,7 +237,7 @@ void LLStatusBar::draw()
 	if (isBackgroundVisible())
 	{
 		static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
-		static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow");
+		static LLUIColor color_drop_shadow = LLUIColorTable::instance().getColor("ColorDropShadow");
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
 			color_drop_shadow, drop_shadow_floater );
 	}
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index a1384c28ba..a422db1cc1 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -64,7 +64,7 @@ const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
 		style->setFontName(LLStringUtil::null);
 		if (source != LLUUID::null && source != gAgent.getID() )
 		{
-			style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 			std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
 			style->setLinkHREF(link);
 		}
@@ -90,7 +90,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
 		style->setFontName(LLStringUtil::null);
 		if (id != LLUUID::null && !link.empty())
 		{
-			style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+			style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 			style->setLinkHREF(link);
 		}
 		else
@@ -115,6 +115,6 @@ void LLStyleMap::update()
 	{
 		LLStyleSP &style = iter->second;
 		// Update the link color in case it has been changed.
-		style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
+		style->setColor(LLUIColorTable::instance().getColor("HTMLLinkColor"));
 	}
 }
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index ca78073575..ee6e36518f 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -359,7 +359,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 			// Orbit tool
 			if (hasMouseCapture())
 			{
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWindowWidth();
+				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
@@ -387,7 +387,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 				F32 dist = (F32) camera_to_focus.normVec();
 
 				// Fudge factor for pan
-				F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWindowWidth();
+				F32 meters_per_pixel = 3.f * dist / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
@@ -409,7 +409,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 			if (hasMouseCapture())
 			{
 
-				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWindowWidth();
+				const F32 RADIANS_PER_PIXEL = 360.f * DEG_TO_RAD / gViewerWindow->getWorldViewWidth();
 
 				if (dx != 0)
 				{
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 88e79fd4f4..abadd251c1 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -510,8 +510,8 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 	const F32 RADIANS_PER_PIXEL_X = 0.01f;
 	const F32 RADIANS_PER_PIXEL_Y = 0.01f;
 
-	S32 dx = x - (gViewerWindow->getWindowWidth() / 2);
-	S32 dy = y - (gViewerWindow->getWindowHeight() / 2);
+	S32 dx = x - (gViewerWindow->getWorldViewWidth() / 2);
+	S32 dy = y - (gViewerWindow->getWorldViewHeight() / 2);
 
 	if (dx != 0 || dy != 0)
 	{
@@ -631,10 +631,10 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			// Handle auto-rotation at screen edge.
 			LLVector3 grab_pos_agent = gAgent.getPosAgentFromGlobal( grab_point_global );
 
-			LLCoordGL grab_center_gl( gViewerWindow->getWindowWidth() / 2, gViewerWindow->getWindowHeight() / 2);
+			LLCoordGL grab_center_gl( gViewerWindow->getWorldViewWidth() / 2, gViewerWindow->getWorldViewHeight() / 2);
 			LLViewerCamera::getInstance()->projectPosAgentToScreen(grab_pos_agent, grab_center_gl);
 
-			const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
+			const S32 ROTATE_H_MARGIN = gViewerWindow->getWorldViewWidth() / 20;
 			const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
 			const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
 			// ...build mode moves camera about focus point
@@ -649,7 +649,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 					gAgent.cameraOrbitAround(rotate_angle);
 				}
 			}
-			else if (grab_center_gl.mX > gViewerWindow->getWindowWidth() - ROTATE_H_MARGIN)
+			else if (grab_center_gl.mX > gViewerWindow->getWorldViewWidth() - ROTATE_H_MARGIN)
 			{
 				if (gAgent.getFocusOnAvatar())
 				{
@@ -662,7 +662,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			}
 
 			// Don't move above top of screen or below bottom
-			if ((grab_center_gl.mY < gViewerWindow->getWindowHeight() - 6)
+			if ((grab_center_gl.mY < gViewerWindow->getWorldViewHeight() - 6)
 				&& (grab_center_gl.mY > 24))
 			{
 				// Transmit update to simulator
@@ -884,7 +884,7 @@ void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask)
 
 	// Look for cursor against the edge of the screen
 	// Only works in fullscreen
-	if (!gSavedSettings.getBOOL("NotFullScreen"))
+	if (gSavedSettings.getBOOL("WindowFullScreen"))
 	{
 		if (gAgent.cameraThirdPerson() )
 		{
@@ -893,7 +893,7 @@ void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask)
 				gAgent.yaw(rotate_angle);
 				//gAgent.setControlFlags(AGENT_CONTROL_YAW_POS);
 			}
-			else if (x == (gViewerWindow->getWindowWidth() - 1) )
+			else if (x == (gViewerWindow->getWorldViewWidth() - 1) )
 			{
 				gAgent.yaw(-rotate_angle);
 				//gAgent.setControlFlags(AGENT_CONTROL_YAW_NEG);
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index 72fd8b3bac..3dc0ea646a 100644
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -137,7 +137,7 @@ void LLToolGun::draw()
 	{
 		LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga");
 		crosshair->draw(
-			( gViewerWindow->getWindowWidth() - crosshair->getWidth() ) / 2,
-			( gViewerWindow->getWindowHeight() - crosshair->getHeight() ) / 2);
+			( gViewerWindow->getWorldViewWidth() - crosshair->getWidth() ) / 2,
+			( gViewerWindow->getWorldViewHeight() - crosshair->getHeight() ) / 2);
 	}
 }
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index e3ee209030..cf3d15a12a 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -180,6 +180,8 @@ void LLToolMgr::setCurrentTool( LLTool* tool )
 
 	mBaseTool = tool;
 	updateToolStatus();
+
+	mSavedTool = NULL;
 }
 
 LLTool* LLToolMgr::getCurrentTool()
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 8e4f637832..5929ecd928 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -112,7 +112,7 @@ void LLTracker::stopTracking(void* userdata)
 // static virtual
 void LLTracker::drawHUDArrow()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	/* tracking autopilot destination has been disabled 
 	   -- 2004.01.09, Leviathan
@@ -163,7 +163,7 @@ void LLTracker::render3D()
 		return;
 	}
 	
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	// Arbitary location beacon
 	if( instance()->mIsTrackingLocation )
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index f5160fd26c..153e3e7382 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -144,7 +144,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
 		msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );
 		mLabelBox[line_num]->setRect(msg_rect);
 		mLabelBox[line_num]->setText(cur_line);
-		mLabelBox[line_num]->setColor( gSavedSkinSettings.getColor( "LabelTextColor" ) );
+		mLabelBox[line_num]->setColor( LLUIColorTable::instance().getColor( "LabelTextColor" ) );
 		mLabelBox[line_num]->setVisible(TRUE);
 		msg_y -= line_height;
 		++line_num;
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 320b950649..0f3feb789f 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -78,7 +78,6 @@ BOOL 				gHackGodmode = FALSE;
 
 
 LLControlGroup gSavedSettings("Global");	// saved at end of session
-LLControlGroup gSavedSkinSettings("Skinning");	// saved at end of session
 LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
 LLControlGroup gCrashSettings("CrashSettings");	// saved at end of session
 LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings
@@ -585,7 +584,6 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("DebugViews")->getSignal()->connect(boost::bind(&handleDebugViewsChanged, _2));
 	gSavedSettings.getControl("UserLogFile")->getSignal()->connect(boost::bind(&handleLogFileChanged, _2));
 	gSavedSettings.getControl("RenderHideGroupTitle")->getSignal()->connect(boost::bind(handleHideGroupTitleChanged, _2));
-	gSavedSkinSettings.getControl("EffectColor")->getSignal()->connect(boost::bind(handleEffectColorChanged, _2));
 	gSavedSettings.getControl("HighResSnapshot")->getSignal()->connect(boost::bind(handleHighResSnapshotChanged, _2));
 	gSavedSettings.getControl("VectorizePerfTest")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
 	gSavedSettings.getControl("VectorizeEnable")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
@@ -603,6 +601,69 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
 }
 
+class ColorConvertFunctor : public LLControlGroup::ApplyFunctor
+{
+public:
+    ColorConvertFunctor(LLUIColorTable::Params& params)
+        :mParams(params)
+    {
+    }
+
+    void apply(const std::string& name, LLControlVariable* control)
+    {
+        if(control->isType(TYPE_COL4))
+        {
+            LLUIColorTable::ColorParams color_params;
+            color_params.value = LLColor4(control->getValue());
+
+            mParams.color_entries.add(LLUIColorTable::ColorEntryParams().name(name).color(color_params));
+        }
+    }
+
+private:
+    LLUIColorTable::Params& mParams;
+};
+
+static void convert_legacy_color_settings(const std::string& location_key, ELLPath path)
+{
+	LLControlGroup::getInstance("Skinning")->cleanup();
+	LLAppViewer::instance()->loadSettingsFromDirectory(location_key);
+
+	LLUIColorTable::Params params;
+	ColorConvertFunctor ccf(params);
+	LLControlGroup::getInstance("Skinning")->applyToAll(&ccf);
+
+	LLXMLNodePtr output_node = new LLXMLNode("colors", false);
+	LLXUIParser::instance().writeXUI(output_node, params);
+
+	if(!output_node->isNull())
+	{
+		std::string filename = gDirUtilp->getExpandedFilename(path, "colors_def.xml");
+		LLFILE *fp = LLFile::fopen(filename, "w");
+
+		if(fp != NULL)
+		{
+			LLXMLNode::writeHeaderToFile(fp);
+			output_node->writeToFile(fp);
+
+			fclose(fp);
+		}
+	}
+
+	LLControlGroup::getInstance("Skinning")->cleanup();
+}
+
+void convert_legacy_color_settings()
+{
+	LLControlGroup saved_skin_settings("Skinning");
+
+	convert_legacy_color_settings("DefaultSkin", LL_PATH_DEFAULT_SKIN);
+	convert_legacy_color_settings("CurrentSkin", LL_PATH_TOP_SKIN);
+	convert_legacy_color_settings("UserSkin", LL_PATH_USER_SKIN);
+
+	saved_skin_settings.cleanup();
+}
+
 
 #if TEST_CACHED_CONTROL
 
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index 3271e5fe9b..0e1c24e4fb 100644
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -50,9 +50,12 @@ void settings_setup_listeners();
 // for the graphics settings
 void create_graphics_group(LLControlGroup& group);
 
+// convert legacy colors.xml LLSD based color settings to
+// newer colors_def.xml XUI/Params based color settings
+void convert_legacy_color_settings();
+
 // saved at end of session
 extern LLControlGroup gSavedSettings;
-extern LLControlGroup gSavedSkinSettings;
 extern LLControlGroup gSavedPerAccountSettings;
 extern LLControlGroup gWarningSettings;
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 826aca5e64..ae7099d382 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -523,7 +523,7 @@ void init_menus()
 	///
 	LLColor4 color;
 
-	LLColor4 context_menu_color = gSavedSkinSettings.getColor("MenuPopupBgColor");
+	LLColor4 context_menu_color = LLUIColorTable::instance().getColor("MenuPopupBgColor");
 	
 	gPieSelf->setBackgroundColor( context_menu_color );
 	gPieAvatar->setBackgroundColor( context_menu_color );
@@ -532,17 +532,17 @@ void init_menus()
 
 	gPieLand->setBackgroundColor( context_menu_color );
 
-	color = gSavedSkinSettings.getColor( "MenuPopupBgColor" );
+	color = LLUIColorTable::instance().getColor( "MenuPopupBgColor" );
 	gPopupMenuView->setBackgroundColor( color );
 
 	// If we are not in production, use a different color to make it apparent.
 	if (LLViewerLogin::getInstance()->isInProductionGrid())
 	{
-		color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
+		color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
 	}
 	else
 	{
-		color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
+		color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
 	}
 	gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_viewer.xml", gMenuHolder);
 	gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
@@ -7983,6 +7983,7 @@ void initialize_menus()
 
 
 	// Advanced > XUI
+	commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));
 	view_listener_t::addMenu(new LLAdvancedShowFontTest(), "Advanced.ShowFontTest");
 	view_listener_t::addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
 	view_listener_t::addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 8e9c798aca..468c9fbb66 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1020,16 +1020,16 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset)
 
 void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 {
-	LLColor4 above_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnAboveWater" );
-	LLColor4 below_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnBelowWater" );
+	LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" );
+	LLColor4 below_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnBelowWater" );
 	LLColor4 you_own_above_water_color = 
-						gSavedSkinSettings.getColor( "NetMapYouOwnAboveWater" );
+						LLUIColorTable::instance().getColor( "NetMapYouOwnAboveWater" );
 	LLColor4 you_own_below_water_color = 
-						gSavedSkinSettings.getColor( "NetMapYouOwnBelowWater" );
+						LLUIColorTable::instance().getColor( "NetMapYouOwnBelowWater" );
 	LLColor4 group_own_above_water_color = 
-						gSavedSkinSettings.getColor( "NetMapGroupOwnAboveWater" );
+						LLUIColorTable::instance().getColor( "NetMapGroupOwnAboveWater" );
 	LLColor4 group_own_below_water_color = 
-						gSavedSkinSettings.getColor( "NetMapGroupOwnBelowWater" );
+						LLUIColorTable::instance().getColor( "NetMapGroupOwnBelowWater" );
 
 
 	for (S32 i = 0; i < mMapObjects.count(); i++)
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index 5b60ed5a27..2056a4be1b 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -206,12 +206,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
 	{
 		return;
 	}
-	const LLColor4U avail = gSavedSkinSettings.getColor4("PropertyColorAvail");
-	const LLColor4U owned = gSavedSkinSettings.getColor4("PropertyColorOther");
-	const LLColor4U group = gSavedSkinSettings.getColor4("PropertyColorGroup");
-	const LLColor4U self  = gSavedSkinSettings.getColor4("PropertyColorSelf");
-	const LLColor4U for_sale  = gSavedSkinSettings.getColor4("PropertyColorForSale");
-	const LLColor4U auction  = gSavedSkinSettings.getColor4("PropertyColorAuction");
+	const LLColor4U avail = LLUIColorTable::instance().getColor("PropertyColorAvail").get();
+	const LLColor4U owned = LLUIColorTable::instance().getColor("PropertyColorOther").get();
+	const LLColor4U group = LLUIColorTable::instance().getColor("PropertyColorGroup").get();
+	const LLColor4U self  = LLUIColorTable::instance().getColor("PropertyColorSelf").get();
+	const LLColor4U for_sale  = LLUIColorTable::instance().getColor("PropertyColorForSale").get();
+	const LLColor4U auction  = LLUIColorTable::instance().getColor("PropertyColorAuction").get();
 
 	// Create the base texture.
 	U8 *raw = mImageRaw->getData();
@@ -314,11 +314,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
 	
 	S32 row, col;
 
-	const LLColor4U self_coloru  = gSavedSkinSettings.getColor4("PropertyColorSelf");
-	const LLColor4U other_coloru = gSavedSkinSettings.getColor4("PropertyColorOther");
-	const LLColor4U group_coloru = gSavedSkinSettings.getColor4("PropertyColorGroup");
-	const LLColor4U for_sale_coloru = gSavedSkinSettings.getColor4("PropertyColorForSale");
-	const LLColor4U auction_coloru = gSavedSkinSettings.getColor4("PropertyColorAuction");
+	const LLColor4U self_coloru  = LLUIColorTable::instance().getColor("PropertyColorSelf").get();
+	const LLColor4U other_coloru = LLUIColorTable::instance().getColor("PropertyColorOther").get();
+	const LLColor4U group_coloru = LLUIColorTable::instance().getColor("PropertyColorGroup").get();
+	const LLColor4U for_sale_coloru = LLUIColorTable::instance().getColor("PropertyColorForSale").get();
+	const LLColor4U auction_coloru = LLUIColorTable::instance().getColor("PropertyColorAuction").get();
 
 	// Build into dynamic arrays, then copy into static arrays.
 	LLDynamicArray<LLVector3, 256> new_vertex_array;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 2689fff533..569eba2f20 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1526,10 +1526,10 @@ void LLViewerWindow::initBase()
 	params.rect(LLRect (0, 1, 1, 0));
 	params.h_pad(4);
 	params.v_pad(2);
-	params.text_color(gSavedSkinSettings.getColor( "ToolTipTextColor" ));
-	params.border_color(gSavedSkinSettings.getColor( "ToolTipBorderColor" ));
+	params.text_color(LLUIColorTable::instance().getColor( "ToolTipTextColor" ));
+	params.border_color(LLUIColorTable::instance().getColor( "ToolTipBorderColor" ));
 	params.border_visible(false);
-	params.background_color(gSavedSkinSettings.getColor( "ToolTipBgColor" ));
+	params.background_color(LLUIColorTable::instance().getColor( "ToolTipBgColor" ));
 	params.bg_visible(true);
 	params.font.style("NORMAL");
 	params.border_drop_shadow_visible(true);
@@ -1824,7 +1824,7 @@ void LLViewerWindow::reshape(S32 width, S32 height)
 
 
 		// store the mode the user wants (even if not there yet)
-		gSavedSettings.setBOOL("NotFullScreen", !mWantFullscreen);
+		gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen);
 
 		// store new settings for the mode we are in, regardless
 		if (!mWindow->getFullscreen())
@@ -1887,19 +1887,19 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
 
     if(god_mode && LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuBarGodBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
     }
     else if(god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionGodBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
     }
     else if(!god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
     }
     else 
     {
-        new_bg_color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
+        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
     }
 
     if(gMenuBarView)
@@ -2162,10 +2162,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
 	if( keyboard_focus )
 	{
+		LLLineEditor* chat_bar = gBottomTray ? gBottomTray->getChatBox() : NULL;
 		// arrow keys move avatar while chatting hack
-		if (gChatBar && gChatBar->inputEditorHasFocus())
+		if (chat_bar && chat_bar->hasFocus())
 		{
-			if (gChatBar->getCurrentChat().empty() || gSavedSettings.getBOOL("ArrowKeysMoveAvatar"))
+			if (chat_bar->getText().empty() || gSavedSettings.getBOOL("ArrowKeysMoveAvatar"))
 			{
 				switch(key)
 				{
@@ -2895,15 +2896,17 @@ void LLViewerWindow::updateKeyboardFocus()
 
 	if(LLSideTray::instanceCreated())//just getInstance will create sidetray. we don't want this
 		LLSideTray::getInstance()->highlightFocused();
-	
 
-	if (gSavedSettings.getBOOL("ChatBarStealsFocus") 
-		&& gChatBar 
-		&& gFocusMgr.getKeyboardFocus() == NULL 
-		&& gChatBar->isInVisibleChain())
-	{
-		gChatBar->startChat(NULL);
-	}
+	//NOTE: this behavior is no longer desirable with a permanently visible chat batr
+	// which would *always* steal focus, disallowing navigation of the world via WASD controls --RN
+	
+	//if (gSavedSettings.getBOOL("ChatBarStealsFocus") 
+	//	&& gChatBar 
+	//	&& gFocusMgr.getKeyboardFocus() == NULL 
+	//	&& gChatBar->isInVisibleChain())
+	//{
+	//	gChatBar->startChat(NULL);
+	//}
 
 
 }
@@ -4649,7 +4652,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
 	BOOL was_maximized = gSavedSettings.getBOOL("WindowMaximized");
 	mWantFullscreen = fullscreen;
 	mShowFullscreenProgress = show_progress_bar;
-	gSavedSettings.setBOOL("NotFullScreen", !mWantFullscreen);
+	gSavedSettings.setBOOL("WindowFullScreen", mWantFullscreen);
 
 	//gResizeScreenTexture = TRUE;
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c2b54ec9c6..b38e71236d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2660,7 +2660,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					new_name = TRUE;
 				}
 				
-				LLColor4 avatar_name_color = gSavedSkinSettings.getColor( "AvatarNameColor" );
+				LLColor4 avatar_name_color = LLUIColorTable::instance().getColor( "AvatarNameColor" );
 				avatar_name_color.setAlpha(alpha);
 				mNameText->setColor(avatar_name_color);
 				
@@ -2802,7 +2802,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				std::deque<LLChat>::iterator chat_iter = mChats.begin();
 				mNameText->clearString();
 
-				LLColor4 new_chat = gSavedSkinSettings.getColor( "AvatarNameColor" );
+				LLColor4 new_chat = LLUIColorTable::instance().getColor( "AvatarNameColor" );
 				LLColor4 normal_chat = lerp(new_chat, LLColor4(0.8f, 0.8f, 0.8f, 1.f), 0.7f);
 				LLColor4 old_chat = lerp(normal_chat, LLColor4(0.6f, 0.6f, 0.6f, 1.f), 0.7f);
 				if (mTyping && mChats.size() >= MAX_BUBBLE_CHAT_UTTERANCES) 
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index d99758edf8..d4df141477 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -368,7 +368,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 		initSunDirection(mSunDefaultPosition, LLVector3(0, 0, 0));
 	}
 	mAmbientScale = gSavedSettings.getF32("SkyAmbientScale");
-	mNightColorShift = gSavedSkinSettings.getColor3("SkyNightColorShift");
+	mNightColorShift = gSavedSettings.getColor3("SkyNightColorShift");
 	mFogColor.mV[VRED] = mFogColor.mV[VGREEN] = mFogColor.mV[VBLUE] = 0.5f;
 	mFogColor.mV[VALPHA] = 0.0f;
 	mFogRatio = 1.2f;
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 9ac758433c..9e04c14beb 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -284,7 +284,7 @@ BOOL is_agent_in_region(LLViewerRegion* region, LLSimInfo* info)
 
 void LLWorldMapView::draw()
 {
-	static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+	static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
 	
 	LLTextureView::clearDebugImages();
 
@@ -908,8 +908,8 @@ void LLWorldMapView::drawImageStack(const LLVector3d& global_pos, LLUIImagePtr i
 
 void LLWorldMapView::drawAgents()
 {
-	static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
-	static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
+	static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white);
+	static LLUIColor map_avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
 	
 	F32 agents_scale = (gMapScale * 0.9f) / 256.f;
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 25ed853146..88d2eab66d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -5094,8 +5094,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 		F32 minLum = llmax(gSavedSettings.getF32("RenderGlowMinLuminance"), 0.0f);
 		F32 maxAlpha = gSavedSettings.getF32("RenderGlowMaxExtractAlpha");		
 		F32 warmthAmount = gSavedSettings.getF32("RenderGlowWarmthAmount");	
-		LLVector3 lumWeights = gSavedSkinSettings.getVector3("RenderGlowLumWeights");
-		LLVector3 warmthWeights = gSavedSkinSettings.getVector3("RenderGlowWarmthWeights");
+		LLVector3 lumWeights = gSavedSettings.getVector3("RenderGlowLumWeights");
+		LLVector3 warmthWeights = gSavedSettings.getVector3("RenderGlowWarmthWeights");
 		gGlowExtractProgram.uniform1f("minLuminance", minLum);
 		gGlowExtractProgram.uniform1f("maxExtractAlpha", maxAlpha);
 		gGlowExtractProgram.uniform3f("lumWeights", lumWeights.mV[0], lumWeights.mV[1], lumWeights.mV[2]);
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 49ea0bc8aa..94b9b04bb0 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -123,9 +123,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -171,9 +171,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>1</real>
-        <real>0.75</real>
-        <real>0.24</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>0.5</real>
       </array>
     </map>
@@ -203,10 +203,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.86</real>
-        <real>0.86</real>
-        <real>0.86</real>
-        <real>1</real>
+          <real>1</real>
+          <real>1</real>
+          <real>1</real>
+          <real>1</real>
       </array>
     </map>
     <key>ButtonLabelDisabledColor</key>
@@ -219,10 +219,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.58</real>
-        <real>0.66</real>
-        <real>0.84</real>
-        <real>0.78</real>
+        <real>0.75</real>
+        <real>0.75</real>
+        <real>0.75</real>
+        <real>0.7799999713897705078125</real>
       </array>
     </map>
     <key>ButtonLabelSelectedColor</key>
@@ -251,10 +251,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.64</real>
-        <real>0.75</real>
-        <real>0.93</real>
-        <real>0.78</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
+        <real>0.7799999713897705078125</real>
       </array>
     </map>
     <key>ButtonSelectedBgColor</key>
@@ -267,9 +267,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.24</real>
-        <real>0.24</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -299,9 +299,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.24</real>
-        <real>0.24</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -411,9 +411,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.5</real>
-        <real>0.0</real>
-        <real>0.0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1.0</real>
       </array>
     </map>
@@ -1003,9 +1003,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0</real>
-        <real>0</real>
-        <real>0.08</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -1035,9 +1035,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1115,9 +1115,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.61</real>
-        <real>0</real>
+        <real>0.272800028324127197265625</real>
+        <real>0.607199966907501220703125</real>
+        <real>0.5601749420166015625</real>
         <real>1</real>
       </array>
     </map>
@@ -1131,9 +1131,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.94</real>
-        <real>0.65</real>
-        <real>0.35</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1211,9 +1211,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.27</real>
-        <real>0.67</real>
-        <real>1</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
         <real>1</real>
       </array>
     </map>
@@ -1259,10 +1259,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.60</real>
-        <real>0.60</real>
-        <real>1.0</real>
-        <real>1.0</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
+        <real>1</real>
       </array>
     </map>
     <key>HealthTextColor</key>
@@ -1404,9 +1404,9 @@
       <key>Value</key>
       <array>
         <real>1</real>
+        <real>0.5</real>
         <real>0</real>
         <real>1</real>
-        <real>1</real>
       </array>
     </map>
     <key>HighlightParentColor</key>
@@ -1595,9 +1595,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.64</real>
-        <real>0.75</real>
-        <real>0.93</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>0.5</real>
       </array>
     </map>
@@ -1611,9 +1611,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.58</real>
-        <real>0.66</real>
-        <real>0.84</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -1724,9 +1724,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.0</real>
         <real>1.0</real>
-        <real>0.0</real>
+        <real>1.0</real>
+        <real>1.0</real>
         <real>1.0</real>
       </array>
     </map>
@@ -1756,10 +1756,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>1.0</real>
-        <real>1.0</real>
-        <real>1.0</real>
-        <real>1.0</real>
+        <real>0.53125</real>
+        <real>0</real>
+        <real>0.498047053813934326171875</real>
+        <real>1</real>
       </array>
     </map>
     <key>MapFrustumColor</key>
@@ -1854,9 +1854,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.5</real>
-        <real>0.24</real>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
         <real>1</real>
       </array>
     </map>
@@ -2014,9 +2014,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.72</real>
-        <real>0.72</real>
-        <real>0.74</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2500,36 +2500,6 @@
         <real>0.4</real>
       </array>
     </map>
-    <key>RenderGlowLumWeights</key>
-    <map>
-      <key>Comment</key>
-      <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
-      <key>Value</key>
-      <array>
-        <real>0.299</real>
-        <real>0.587</real>
-        <real>0.114</real>
-      </array>
-    </map>
-    <key>RenderGlowWarmthWeights</key>
-    <map>
-      <key>Comment</key>
-      <string>Weight of each color channel used before finding the max warmth</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector3</string>
-      <key>Value</key>
-      <array>
-        <real>1.0</real>
-        <real>0.5</real>
-        <real>0.7</real>
-      </array>
-    </map>
     <key>ScriptBgReadOnlyColor</key>
     <map>
       <key>Comment</key>
@@ -2572,10 +2542,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.39</real>
-        <real>0.39</real>
-        <real>0.39</real>
-        <real>0.16</real>
+        <real>0.334399998188018798828125</real>
+        <real>0.545599997043609619140625</real>
+        <real>0.51590001583099365234375</real>
+        <real>0.1599999964237213134765625</real>
       </array>
     </map>
     <key>ScrollBgReadOnlyColor</key>
@@ -2716,9 +2686,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.24</real>
-        <real>0.3</real>
-        <real>0.49</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2732,9 +2702,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.6</real>
-        <real>0.6</real>
-        <real>0.62</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2770,21 +2740,6 @@
         <real>1</real>
       </array>
     </map>
-    <key>SkyNightColorShift</key>
-    <map>
-      <key>Comment</key>
-      <string>Controls moonlight color (base color applied to moon as light source)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Color3</string>
-      <key>Value</key>
-      <array>
-        <real>0.67</real>
-        <real>0.67</real>
-        <real>1.0</real>
-      </array>
-    </map>
     <key>SliderDisabledThumbColor</key>
     <map>
       <key>Comment</key>
@@ -2795,9 +2750,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0</real>
-        <real>0</real>
-        <real>0</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
@@ -2811,9 +2766,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.78</real>
-        <real>0.78</real>
-        <real>0.78</real>
+        <real>1</real>
+        <real>1</real>
+        <real>1</real>
         <real>1</real>
       </array>
     </map>
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
new file mode 100644
index 0000000000..19c842b816
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
new file mode 100644
index 0000000000..e47f913db1
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
new file mode 100644
index 0000000000..b9879dcc8a
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
new file mode 100644
index 0000000000..e2c67de9c0
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
new file mode 100644
index 0000000000..08f7493a02
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png
new file mode 100644
index 0000000000..414f4509c6
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png
new file mode 100644
index 0000000000..5416d73310
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png
new file mode 100644
index 0000000000..1578e0dfc5
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Accordion_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png
new file mode 100644
index 0000000000..511eb94386
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Container.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
new file mode 100644
index 0000000000..1951413f8d
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
new file mode 100644
index 0000000000..295cd89a57
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
new file mode 100644
index 0000000000..8364716e02
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
new file mode 100644
index 0000000000..21f1c2d8a8
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
new file mode 100644
index 0000000000..0758cbcf0d
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
new file mode 100644
index 0000000000..3946917c7c
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
new file mode 100644
index 0000000000..eeef28e5a5
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
new file mode 100644
index 0000000000..c2cbc2b1e5
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
new file mode 100644
index 0000000000..b0f1f16398
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
new file mode 100644
index 0000000000..41b5d24d87
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
new file mode 100644
index 0000000000..083acc0156
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
new file mode 100644
index 0000000000..ee4649a8f9
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
new file mode 100644
index 0000000000..55c02160e3
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
new file mode 100644
index 0000000000..2f6ea90196
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
new file mode 100644
index 0000000000..642113b135
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
new file mode 100644
index 0000000000..01fd765c3d
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
new file mode 100644
index 0000000000..74e00635f1
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
new file mode 100644
index 0000000000..8a0d98a780
--- /dev/null
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
new file mode 100644
index 0000000000..19569501fe
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
new file mode 100644
index 0000000000..a91b74819f
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
new file mode 100644
index 0000000000..3648c42656
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
new file mode 100644
index 0000000000..a2caf227a7
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
new file mode 100644
index 0000000000..a4060e5e37
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
new file mode 100644
index 0000000000..9c2815ebba
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
new file mode 100644
index 0000000000..377b707529
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
new file mode 100644
index 0000000000..a69a729bd4
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
new file mode 100644
index 0000000000..5ab4abc5b8
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
diff --git a/indra/newview/skins/default/textures/navbar/Help_Over.png b/indra/newview/skins/default/textures/navbar/Help_Over.png
new file mode 100644
index 0000000000..b9bc0d0f87
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Help_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png
new file mode 100644
index 0000000000..ed3695f9d5
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Help_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png
new file mode 100644
index 0000000000..fe3bc63b77
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Home_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Home_Over.png b/indra/newview/skins/default/textures/navbar/Home_Over.png
new file mode 100644
index 0000000000..d9c6b3842e
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Home_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png
new file mode 100644
index 0000000000..64722255a3
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Info_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png
new file mode 100644
index 0000000000..84f1d03129
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Info_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png
new file mode 100644
index 0000000000..169105829e
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Info_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
new file mode 100644
index 0000000000..1df61751a8
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
new file mode 100644
index 0000000000..fc4f0c07ef
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Row_Selection.png
diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png
new file mode 100644
index 0000000000..c43519d5f1
--- /dev/null
+++ b/indra/newview/skins/default/textures/navbar/Search.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
new file mode 100644
index 0000000000..918be7555f
--- /dev/null
+++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
new file mode 100644
index 0000000000..b3316386b9
--- /dev/null
+++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 84dd3ffd7a..e6c9cdb246 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,75 +1,85 @@
 <textures version="101">
 
-  <texture name="icn_scrollbar_thumb.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
-  <texture name="icn_scrollbar_bg.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
+  <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" />
+  <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" />
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
+
+  <!--There are still references to this old textfield art in the code somewhere -erica-->
   <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5"/>
-  
-  <texture name="button_disabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="button_enabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
+  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
 
-  <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
-  
-  <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> 
-  
-  <texture name="button_enabled_selected_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-  
-  <texture name="checkbox_disabled_false.tga"	preload="true"/>
-  <texture name="checkbox_disabled_true.tga"	preload="true"/>
-  <texture name="checkbox_enabled_false.tga"	preload="true"/>
-  <texture name="checkbox_enabled_true.tga"	preload="true"/>
-  
-  <texture name="close_in_blue.tga"	preload="true"/>
+  <texture name="TextField_Search_Disabled" file_name="widgets/TextField_Search_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Off" file_name="widgets/TextField_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Search_Active" file_name="widgets/TextField_Search_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Search_Off" file_name="widgets/TextField_Search_Off.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+  <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="4" scale.top="18" scale.right="252" scale.bottom="4" />
+
+  <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+
+  <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+  <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+  <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
+
+  <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
+  <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
+  <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" />
+  <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" />
 
   <texture name="minimize_inactive.tga" preload="true"/>
-  <texture name="minimize.tga"	preload="true"/>
+  <texture name="minimize.tga" preload="true" />
   <texture name="minimize_pressed.tga"	preload="true"/>
-  
-  <texture name="radio_active_false.tga"	preload="true"/>
-  <texture name="radio_active_true.tga"	preload="true"/>
-  <texture name="radio_inactive_false.tga"	preload="true"/>
-  <texture name="radio_inactive_true.tga"	preload="true"/>
-  
-  <texture name="combobox_arrow.tga"	preload="true"/>
-  
-  <texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
-  
-  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
-  
+
+  <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" />
+  <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
+  <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
+
+  <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" />
+  <texture name="RadioButton_On" file_name="widgets/RadioButton_On.png" preload="true" />
+  <texture name="RadioButton_Disabled" file_name="widgets/RadioButton_Disabled.png" preload="true" />
+  <texture name="RadioButton_On_Disabled" file_name="widgets/RadioButton_On_Disabled.png"	preload="true" />
+
+  <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Over" file_name="widgets/ComboButton_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Press" file_name="widgets/ComboButton_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+
+  <texture name="DropDown_Disabled" file_name="widgets/DropDown_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+
+  <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true"/>
+
+  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
+
   <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
-  
+
   <texture name="toolbar_tab.tga"	preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8"/>
   <texture name="toolbar_bg.tga"	preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16"/>
-  
-  <texture name="progressbar_fill.tga"	preload="true" scale.left="10" scale.top="7" scale.right="65" scale.bottom="7"/>
-  <texture name="progressbar_track.tga"	preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7"/>
-  
-  <texture name="scrollbutton_down_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_down_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_left_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_left_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_right_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_right_out_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_up_in_blue.tga"	preload="true"/>
-  <texture name="scrollbutton_up_out_blue.tga"	preload="true"/>
-  <texture name="spin_down_in_blue.tga"	preload="true"/>
-  <texture name="spin_down_out_blue.tga"	preload="true"/>
-  <texture name="spin_up_in_blue.tga"	preload="true"/>
-  <texture name="spin_up_out_blue.tga"	preload="true"/>
-  
-  <texture name="square_btn_32x128.tga"	preload="true" scale.left="8" scale.top="10" scale.right="120" scale.bottom="10"/>
-  <texture name="square_btn_selected_32x128.tga"	preload="true" scale.left="2" scale.top="10" scale.right="126" scale.bottom="10"/>
-  
-  <texture name="tab_bottom_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="tab_bottom_selected_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
-  <texture name="tab_left.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
-  <texture name="tab_left_selected.tga"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
+
+  <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" />
+  <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
+
+  <texture name="ScrollArrow_Down" file_name="widgets/ScrollArrow_Down.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Left"	file_name="widgets/ScrollArrow_Left.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Right" file_name="widgets/ScrollArrow_Right.png" preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="ScrollArrow_Up" file_name="widgets/ScrollArrow_Up.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+
+  <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
+  <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
+  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
+  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png"	preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
   <texture name="tab_top_blue.tga"	preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
   <texture name="tab_top_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
-  
+
   <texture name="startup_logo.j2c" preload="true"/>
   <texture name="color_swatch_alpha.tga" preload="true"/>
 
@@ -115,7 +125,7 @@
   <texture name="inv_folder_sound.tga"/>
   <texture name="inv_folder_texture.tga"/>
   <texture name="inv_folder_trash.tga"/>
-  
+
   <texture name="inv_item_animation.tga"/>
   <texture name="inv_item_skin.tga"/>
   <texture name="inv_item_callingcard_offline.tga"/>
@@ -142,13 +152,13 @@
   <texture name="inv_item_texture.tga"/>
   <texture name="inv_item_underpants.tga"/>
   <texture name="inv_item_undershirt.tga"/>
-  
+
   <texture name="lag_status_critical.tga"/>
   <texture name="lag_status_good.tga"/>
   <texture name="lag_status_warning.tga"/>
-  
+
   <texture name="legend.tga"/>
-  
+
   <texture name="map_avatar_16.tga"/>
   <texture name="map_avatar_8.tga"/>
   <texture name="map_avatar_you_8.tga"/>
@@ -158,17 +168,17 @@
   <texture name="map_infohub.tga"/>
   <texture name="map_telehub.tga"/>
   <texture name="map_track_16.tga"/>
-  
+
   <texture name="media_icon.tga" file_name="icn_label_media.tga" />
   <texture name="music_icon.tga" file_name="icn_label_music.tga" />
   <texture name="noentrylines.j2c" use_mips="true"/>
   <texture name="noentrypasslines.j2c" use_mips="true"/>
-  
+
   <texture name="notify_tip_icon.tga"/>
   <texture name="notify_caution_icon.tga"/>
   <texture name="notify_next.png" preload="true"/>
   <texture name="notify_box_icon.tga"/>
-  
+
   <texture name="object_cone.tga"/>
   <texture name="object_cone_active.tga"/>
   <texture name="object_cube.tga"/>
@@ -199,11 +209,11 @@
   <texture name="object_tree_active.tga"/>
   <texture name="object_tube.tga"/>
   <texture name="object_tube_active.tga"/>
-  
+
   <texture name="pixiesmall.j2c" use_mips="true"/>
   <texture name="script_error.j2c" use_mips="true"/>
   <texture name="silhouette.j2c" use_mips="true"/>
-  
+
   <texture name="status_no_build.tga"/>
   <texture name="status_voice.tga"/>
   <texture name="status_buy_currency.tga"/>
@@ -214,7 +224,7 @@
   <texture name="status_health.tga"/>
   <texture name="status_no_push.tga"/>
   <texture name="status_no_scripts.tga"/>
-  
+
   <texture name="tool_dozer.tga"/>
   <texture name="tool_dozer_active.tga"/>
   <texture name="tool_zoom.tga"/>
@@ -226,7 +236,7 @@
   <texture name="icn_active-speakers-typing1.tga"/>
   <texture name="icn_active-speakers-typing2.tga"/>
   <texture name="icn_active-speakers-typing3.tga"/>
-  
+
   <texture name="icn_voice_ptt-off.tga"/>
   <texture name="icn_voice_ptt-on.tga"/>
   <texture name="icn_voice_ptt-on-lvl1.tga"/>
@@ -234,39 +244,51 @@
   <texture name="icn_voice_ptt-on-lvl3.tga"/>
   <texture name="icn_voice-call-end.tga"/>
   <texture name="icn_voice-call-start.tga"/>
-  
+
   <texture name="mute_icon.tga"/>
-  
-  <texture name="icn_slide-groove_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  <texture name="icn_slide-highlight.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  <texture name="icn_slide-thumb_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
-  
+
+  <texture name="SliderTrack_Horiz" file_name="widgets/SliderTrack_Horiz.png" scale.left="4" scale.top="4" scale.right="100" scale.bottom="2" />
+  <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
+
+
   <texture name="icn_speaker-muted_dark.tga"/>
   <texture name="icn_speaker_dark.tga"/>
 
   <texture name="icn_voice-localchat.tga"/>
   <texture name="icn_voice-groupfocus.tga"/>
   <texture name="icn_voice-pvtfocus.tga"/>
-  
+
   <texture name="icn_media-pause.tga"/>
   <texture name="icn_media-play.tga"/>
   <texture name="icn_music-play.tga"/>
   <texture name="icn_music-pause.tga"/>
   <texture name="icn_media_web.tga" preload="true"/>
   <texture name="icn_media_movie.tga" preload="true"/>
-  
+
   <texture name="icn_chatbar.tga"/>
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
   <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
-  
-  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
 
-  <texture name="flyout_btn_right_selected.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_right.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_right_disabled.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
-  <texture name="flyout_btn_left_selected.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
-  <texture name="flyout_btn_left.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
-  <texture name="flyout_btn_left_disabled.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
+  <texture name="SegmentedBtn_Left_Off" file_name="widgets/SegmentedBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Disabled" file_name="widgets/SegmentedBtn_Left_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected" file_name="widgets/SegmentedBtn_Left_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected_Press" file_name="widgets/SegmentedBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Left_Selected_Disabled" file_name="widgets/SegmentedBtn_Left_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+
+  <texture name="SegmentedBtn_Middle_Off" file_name="widgets/SegmentedBtn_Middle_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Press" file_name="widgets/SegmentedBtn_Middle_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Disabled" file_name="widgets/SegmentedBtn_Middle_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected" file_name="widgets/SegmentedBtn_Middle_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected_Press" file_name="widgets/SegmentedBtn_Middle_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Middle_Selected_Disabled" file_name="widgets/SegmentedBtn_Middle_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+
+  <texture name="SegmentedBtn_Right_Off" file_name="widgets/SegmentedBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Press" file_name="widgets/SegmentedBtn_Right_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Disabled" file_name="widgets/SegmentedBtn_Right_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected" file_name="widgets/SegmentedBtn_Right_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected_Press" file_name="widgets/SegmentedBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+  <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
   <texture name="move_forward_out.tga" preload="true"/>
   <texture name="move_forward_in.tga" preload="true"/>
@@ -282,7 +304,7 @@
   <texture name="move_up_out.tga" preload="true"/>
   <texture name="move_down_in.tga" preload="true"/>
   <texture name="move_down_out.tga" preload="true"/>
-  
+
   <texture name="cam_rotate_out.tga" preload="true"/>
   <texture name="cam_rotate_in.tga" preload="true"/>
   <texture name="cam_zoom_out.tga" preload="true"/>
@@ -306,7 +328,7 @@
   <texture name="close_inactive_blue.tga"/>
   <texture name="closebox.tga"/>
   <texture name="icn_clear_lineeditor.tga" />
-  
+
   <texture name="up_arrow.tga" file_name="up_arrow.png"/>
   <texture name="down_arrow.tga" file_name="down_arrow.png"/>
 
@@ -321,17 +343,36 @@
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
-  
+
   <texture name="skin_thumbnail_default.png" preload="true" />
 
   <texture name="default_land_picture.j2c"/>
   <texture name="default_profile_picture.j2c"/>
   <texture name="locked_image.j2c"/>
-  <texture name="menu_separator" file_name="menu_separator.png"/>
+  <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
-  <texture name="sidebar_tab_left.tga"			preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/>
-  <texture name="sidebar_tab_left_selected.tga"	preload="true" scale.left="16" scale.top="8" scale.right="112" scale.bottom="9"/>
+  <texture name="TaskPanel_Tab_Off" file_name="taskpanel/TaskPanel_Tab_Off.png" preload="true" scale.left="4" scale.top="29" scale.right="36" scale.bottom="4" />
+  <texture name="TaskPanel_Tab_Selected" file_name="taskpanel/TaskPanel_Tab_Selected.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
+  <texture name="TaskPanel_BG" file_name="taskpanel/TaskPanel_BG.png" preload="true" scale.left="4" scale.top="146" scale.right="146" scale.bottom="4" />
+  <texture name="TaskPanel_Tab_Unselected" file_name="taskpanel/TaskPanel_Tab_Over.png" preload="true" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
+
+  <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true"/>
+  <texture name="Arrow_Left_Press" file_name="navbar/Arrow_Left_Press.png" preload="true"/>
+  <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true"/>
+  <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true"/>
+  <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="true"/>
+  <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="true"/>
+  <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="true"/>
+  <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="true"/>
+  <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="true"/>
+  <texture name="History_Arrow" file_name="navbar/History_Arrow.png" preload="true"/>
+  <texture name="Search" file_name="navbar/Search.png" preload="true"/>
+  <texture name="Help_Off" file_name="navbar/Help_Off.png" preload="true"/>
+  <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="true"/>
+  
+  <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="true"/>
+  <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/>
+  <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="true"/>
+  
 
-  <texture name="teleport_history_backward.tga" preload="true"/>
-  <texture name="teleport_history_forward.tga" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
new file mode 100644
index 0000000000..c1ee210099
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
new file mode 100644
index 0000000000..2525405f37
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
new file mode 100644
index 0000000000..2d9dba1592
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
new file mode 100644
index 0000000000..beaa7bcbf6
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
new file mode 100644
index 0000000000..bc504d130e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
new file mode 100644
index 0000000000..5bced95a89
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Over.png b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png
new file mode 100644
index 0000000000..5a7162addf
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
new file mode 100644
index 0000000000..44be193678
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
new file mode 100644
index 0000000000..d0fff1b3c3
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
new file mode 100644
index 0000000000..80402458b7
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
new file mode 100644
index 0000000000..b42cc7542e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
new file mode 100644
index 0000000000..bbc0657487
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
new file mode 100644
index 0000000000..b295752ea9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
new file mode 100644
index 0000000000..4764ed4ee2
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
new file mode 100644
index 0000000000..10262d3979
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/DropDown_On.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
new file mode 100644
index 0000000000..16cb25cc77
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png
new file mode 100644
index 0000000000..edf11ac1f5
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ProgressBar.png
diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
new file mode 100644
index 0000000000..bb6d9f4144
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
new file mode 100644
index 0000000000..04e91bdaab
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
new file mode 100644
index 0000000000..1ee0329e66
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
new file mode 100644
index 0000000000..661d1c5611
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
new file mode 100644
index 0000000000..064a4c4f7f
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
new file mode 100644
index 0000000000..48e8aa2eab
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
new file mode 100644
index 0000000000..c227f07513
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
new file mode 100644
index 0000000000..0a4a3a6ad9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
new file mode 100644
index 0000000000..0a4a3a6ad9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
new file mode 100644
index 0000000000..661d1c5611
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
new file mode 100644
index 0000000000..064a4c4f7f
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
new file mode 100644
index 0000000000..48e8aa2eab
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
new file mode 100644
index 0000000000..a1052684b9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
new file mode 100644
index 0000000000..c58e0305ef
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
new file mode 100644
index 0000000000..c09a2197c7
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
new file mode 100644
index 0000000000..d7d444fd0c
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
new file mode 100644
index 0000000000..3e7d803a28
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
new file mode 100644
index 0000000000..a707e8ceb8
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Over.png b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png
new file mode 100644
index 0000000000..a5c8cbe293
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
new file mode 100644
index 0000000000..33eaa14030
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
new file mode 100644
index 0000000000..186822da43
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
new file mode 100644
index 0000000000..605d159eaa
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
new file mode 100644
index 0000000000..42f999a451
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
new file mode 100644
index 0000000000..c79547dffd
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
new file mode 100644
index 0000000000..176ffcdbb9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
new file mode 100644
index 0000000000..e353542ad9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
new file mode 100644
index 0000000000..4d245eb57a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
new file mode 100644
index 0000000000..dd2fceb716
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
new file mode 100644
index 0000000000..8a085aa966
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
new file mode 100644
index 0000000000..cf78ea3924
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
new file mode 100644
index 0000000000..fc7fd93e7a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
new file mode 100644
index 0000000000..53587197da
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
new file mode 100644
index 0000000000..4f31c48c02
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
new file mode 100644
index 0000000000..f89ee3f68f
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
new file mode 100644
index 0000000000..3b39c51a77
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
new file mode 100644
index 0000000000..57ed79d733
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
new file mode 100644
index 0000000000..7afb9c99c3
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
new file mode 100644
index 0000000000..77c4224539
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
new file mode 100644
index 0000000000..8b93dd551e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
new file mode 100644
index 0000000000..3f207cbea2
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
new file mode 100644
index 0000000000..5b8878e0cb
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
new file mode 100644
index 0000000000..379953216b
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
new file mode 100644
index 0000000000..379953216b
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
new file mode 100644
index 0000000000..77c4224539
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
new file mode 100644
index 0000000000..8b93dd551e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
new file mode 100644
index 0000000000..3f207cbea2
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
new file mode 100644
index 0000000000..deb87c8489
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
new file mode 100644
index 0000000000..220df9db25
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
new file mode 100644
index 0000000000..5bbcdcb0b4
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
new file mode 100644
index 0000000000..dde367f05e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
new file mode 100644
index 0000000000..d4f30b9adb
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
new file mode 100644
index 0000000000..ca7027da91
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
new file mode 100644
index 0000000000..220df9db25
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
new file mode 100644
index 0000000000..5bbcdcb0b4
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
new file mode 100644
index 0000000000..dde367f05e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
new file mode 100644
index 0000000000..8e6b9c8c6f
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
new file mode 100644
index 0000000000..b1521199ff
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
new file mode 100644
index 0000000000..467c43fc90
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
new file mode 100644
index 0000000000..2049736897
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
new file mode 100644
index 0000000000..1574f48b28
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
new file mode 100644
index 0000000000..2717e7d7b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
new file mode 100644
index 0000000000..3883518033
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
new file mode 100644
index 0000000000..3883518033
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
new file mode 100644
index 0000000000..ab31f6ded7
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
new file mode 100644
index 0000000000..2049736897
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
new file mode 100644
index 0000000000..1574f48b28
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
new file mode 100644
index 0000000000..b627232012
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
new file mode 100644
index 0000000000..b627232012
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
new file mode 100644
index 0000000000..b6f900d3bd
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
new file mode 100644
index 0000000000..7081f9cfe0
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
new file mode 100644
index 0000000000..232006ee5a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
new file mode 100644
index 0000000000..cd002b3973
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png
new file mode 100644
index 0000000000..ca6daab4e0
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Active.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
new file mode 100644
index 0000000000..3d205a3f2e
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png
new file mode 100644
index 0000000000..911d907acc
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
new file mode 100644
index 0000000000..fa79cb6260
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
new file mode 100644
index 0000000000..8b504af101
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
new file mode 100644
index 0000000000..862b13d219
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
diff --git a/indra/newview/skins/default/textures/windows/Flyout.png b/indra/newview/skins/default/textures/windows/Flyout.png
new file mode 100644
index 0000000000..5596b194c9
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Flyout.png
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
new file mode 100644
index 0000000000..69fc08ceaa
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
new file mode 100644
index 0000000000..fb59f2e61e
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
new file mode 100644
index 0000000000..7177c803b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
new file mode 100644
index 0000000000..ecf01c617a
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
new file mode 100644
index 0000000000..cadd6bc8ce
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
new file mode 100644
index 0000000000..08f8cfc3d4
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
new file mode 100644
index 0000000000..db74b93afd
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
new file mode 100644
index 0000000000..1032e45f7e
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
new file mode 100644
index 0000000000..01dbde102b
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
new file mode 100644
index 0000000000..6614bdd165
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
new file mode 100644
index 0000000000..d790cf57ef
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
new file mode 100644
index 0000000000..fdae4b75f6
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png
new file mode 100644
index 0000000000..16ed63e428
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Resize_Corner.png
diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
new file mode 100644
index 0000000000..78b137cdaf
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png
new file mode 100644
index 0000000000..807e8e553c
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Toast_Over.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
new file mode 100644
index 0000000000..e9f15e76b9
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Window_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
new file mode 100644
index 0000000000..e76e9f3c79
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index cef204eb5f..8084d2427e 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -1,5 +1,633 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
+<floater name="toolbox floater" title="" short_title="Bauen">
+	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
+	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
+	<button label="" label_selected="" name="button create" tool_tip="Erstellen"/>
+	<button label="" label_selected="" name="button land" tool_tip="Land"/>
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Orbit (Strg)" name="radio orbit"/>
+	<check_box label="Schwenken (Strg-Umschalt)" name="radio pan"/>
+	<check_box label="Verschieben" name="radio move"/>
+	<check_box label="Heben (Strg)" name="radio lift"/>
+	<check_box label="Rotieren (Strg-Umschalt)" name="radio spin"/>
+	<check_box label="Position" name="radio position"/>
+	<check_box label="Drehen (Strg)" name="radio rotate"/>
+	<check_box label="Dehnen (Strg-Umschalt)" name="radio stretch"/>
+	<check_box label="Textur auswählen" name="radio select face"/>
+	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
+	<text name="text ruler mode">
+		Lineal:
+	</text>
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Welt
+		</combo_item>
+		<combo_item name="Local">
+			Lokal
+		</combo_item>
+		<combo_item name="Reference">
+			Referenz
+		</combo_item>
+	</combo_box>
+	<check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
+	<check_box label="Texturen dehnen" name="checkbox stretch textures"/>
+	<check_box label="Raster verwenden" name="checkbox snap to grid"/>
+	<button label="Optionen..." label_selected="Optionen..." name="Options..."/>
+	<text name="text status">
+		Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen
+	</text>
+	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraeder"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Zylinder"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halbzylinder"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Kegel"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Halbkegel"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Kugel"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Halbkugel"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Rohr"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Baum"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/>
+	<check_box label="Auswahl behalten" name="checkbox sticky"/>
+	<check_box label="Auswahl kopieren" name="checkbox copy selection"/>
+	<check_box label="Zentrieren" name="checkbox copy centers"/>
+	<check_box label="Drehen" name="checkbox copy rotates"/>
+	<check_box label="Land auswählen" name="radio select land"/>
+	<check_box label="Einebnen" name="radio flatten"/>
+	<check_box label="Anheben" name="radio raise"/>
+	<check_box label="Absenken" name="radio lower"/>
+	<check_box label="Glätten" name="radio smooth"/>
+	<check_box label="Aufrauen" name="radio noise"/>
+	<check_box label="Zurücksetzen" name="radio revert"/>
+	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land ändern"/>
+	<text name="Bulldozer:">
+		Planierraupe:
+	</text>
+	<text name="Dozer Size:">
+		Größe
+	</text>
+	<text name="Strength:">
+		Stärke
+	</text>
+	<text name="obj_count">
+		Ausgewählte Objekte: [COUNT]
+	</text>
+	<text name="prim_count">
+		Primitive: [COUNT]
+	</text>
+	<tab_container name="Object Info Tabs">
+		<panel label="Allgemein" name="General">
+			<text name="Name:">
+				Name:
+			</text>
+			<text name="Description:">
+				Beschreibung:
+			</text>
+			<text name="Creator:">
+				Ersteller:
+			</text>
+			<text name="Creator Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button creator profile"/>
+			<text name="Owner:">
+				Eigentümer:
+			</text>
+			<text name="Owner Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button owner profile"/>
+			<text name="Group:">
+				Gruppe:
+			</text>
+			<text name="Group Name Proxy">
+				Die Lindens
+			</text>
+			<button label="Festlegen..." label_selected="Festlegen..." name="button set group"/>
+			<text name="Permissions:">
+				Berechtigungen:
+			</text>
+			<text name="perm_modify">
+				Sie können dieses Objekt ändern.
+			</text>
+			<check_box label="Mit Gruppe teilen" name="checkbox share with group" tool_tip="Allen Mitgliedern der zugeordneten Gruppe die Erlaubnis erteilen, Ihre Berechtigungen für dieses Objekt zu teilen und zu verwenden. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
+			<string name="text deed continued">
+				Übertragung...
+			</string>
+			<string name="text deed">
+				Übertragung
+			</string>
+			<button label="Übertragung..." label_selected="Übertragung..." name="button deed" tool_tip="In der Gruppe gemeinsam verwendete Objekte können von einem Gruppenfunktionär übertragen werden."/>
+			<check_box label="Verschieben durch beliebige Personen zulassen" name="checkbox allow everyone move"/>
+			<check_box label="Kopieren durch beliebige Personen zulassen" name="checkbox allow everyone copy"/>
+			<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
+			<check_box label="Zu verkaufen" name="checkbox for sale"/>
+			<text name="Cost">
+				Preis:L$
+			</text>
+			<radio_group name="sale type">
+				<radio_item name="Original">
+					Original
+				</radio_item>
+				<radio_item name="Copy">
+					Kopieren
+				</radio_item>
+				<radio_item name="Contents">
+					Inhalt
+				</radio_item>
+			</radio_group>
+			<text name="Next owner can:">
+				Nächster Eigentümer kann:
+			</text>
+			<check_box label="Ändern" name="checkbox next owner can modify"/>
+			<check_box label="Kopieren" name="checkbox next owner can copy"/>
+			<check_box label="Wiederverkaufen" name="checkbox next owner can transfer"/>
+			<text name="label click action">
+				Bei Linksklicken:
+			</text>
+			<combo_box name="clickaction">
+				<combo_item name="Touch/grab(default)">
+					Berühren/Greifen (Standard)
+				</combo_item>
+				<combo_item name="Sitonobject">
+					Auf Objekt sitzen
+				</combo_item>
+				<combo_item name="Buyobject">
+					Objekt kaufen
+				</combo_item>
+				<combo_item name="Payobject">
+					Objekt bezahlen
+				</combo_item>
+				<combo_item name="Open">
+					Öffnen
+				</combo_item>
+				<combo_item name="Play">
+					Parzellenmedien wiedergeben
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Parzellenmedien öffnen
+				</combo_item>
+			</combo_box>
+			<text name="B:">
+				B:
+			</text>
+			<text name="O:">
+				O;
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+			<string name="text modify info 1">
+				Sie können dieses Objekt ändern.
+			</string>
+			<string name="text modify info 2">
+				Sie können diese Objekte ändern.
+			</string>
+			<string name="text modify info 3">
+				Sie können dieses Objekt nicht ändern.
+			</string>
+			<string name="text modify info 4">
+				Sie können diese Objekte nicht ändern.
+			</string>
+			<string name="text modify warning">
+				Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen.
+			</string>
+			<string name="Cost Default">
+				Preis:L$
+			</string>
+			<string name="Cost Total">
+				Summe:L$
+			</string>
+			<string name="Cost Per Unit">
+				Stückpreis:L$
+			</string>
+			<string name="Cost Mixed">
+				Mischpreis
+			</string>
+			<string name="Sale Mixed">
+				Mischverkauf
+			</string>
+		</panel>
+		<panel label="Objekt" name="Object">
+			<text name="select_single">
+				Wählen Sie nur ein Primitivum aus, um Parameter zu bearbeiten.
+			</text>
+			<text name="edit_object">
+				Objektparameter bearbeiten:
+			</text>
+			<check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
+			<check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
+			<check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass Objekt 1 Minute nach Erstellung gelöscht wird."/>
+			<check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/>
+			<text name="label position">
+				Position (Meter)
+			</text>
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
+			<text name="label size">
+				Größe (Meter)
+			</text>
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
+			<text name="label rotation">
+				Rotation (Grad)
+			</text>
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
+			<text name="label material">
+				Material
+			</text>
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Stein
+				</combo_item>
+				<combo_item name="Metal">
+					Metall
+				</combo_item>
+				<combo_item name="Glass">
+					Glas
+				</combo_item>
+				<combo_item name="Wood">
+					Holz
+				</combo_item>
+				<combo_item name="Flesh">
+					Fleisch
+				</combo_item>
+				<combo_item name="Plastic">
+					Kunststoff
+				</combo_item>
+				<combo_item name="Rubber">
+					Gummi
+				</combo_item>
+			</combo_box>
+			<text name="label basetype">
+				Bausteintyp
+			</text>
+			<combo_box name="comboBaseType">
+				<combo_item name="Box">
+					Quader
+				</combo_item>
+				<combo_item name="Cylinder">
+					Zylinder
+				</combo_item>
+				<combo_item name="Prism">
+					Prisma
+				</combo_item>
+				<combo_item name="Sphere">
+					Kugel
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Tube">
+					Rohr
+				</combo_item>
+				<combo_item name="Ring">
+					Ring
+				</combo_item>
+				<combo_item name="Sculpted">
+					Geformt
+				</combo_item>
+			</combo_box>
+			<text name="text cut">
+				Pfadschnitt Beginn und Ende
+			</text>
+			<spinner label="B" name="cut begin"/>
+			<spinner label="E" name="cut end"/>
+			<text name="text hollow">
+				Hohl
+			</text>
+			<text name="text skew">
+				Versatz
+			</text>
+			<spinner name="Scale 1"/>
+			<spinner name="Skew"/>
+			<text name="Hollow Shape">
+				Hohlform
+			</text>
+			<combo_box name="hole">
+				<combo_item name="Default">
+					Standard
+				</combo_item>
+				<combo_item name="Circle">
+					Kreis
+				</combo_item>
+				<combo_item name="Square">
+					Quadrat
+				</combo_item>
+				<combo_item name="Triangle">
+					Dreieck
+				</combo_item>
+			</combo_box>
+			<text name="text twist">
+				Torsion
+			</text>
+			<spinner label="B" name="Twist Begin"/>
+			<spinner label="E" name="Twist End"/>
+			<text name="scale_taper">
+				Verjüngung
+			</text>
+			<text name="scale_hole">
+				Lochgröße
+			</text>
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
+			<text name="text topshear">
+				Verscherung
+			</text>
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
+			<text name="advanced_cut">
+				Profilschnitt-Beginn und Ende
+			</text>
+			<text name="advanced_dimple">
+				Vertiefung-Beginn und Ende
+			</text>
+			<text name="advanced_slice">
+				Anfang/Ende abschneiden
+			</text>
+			<spinner label="B" name="Path Limit Begin"/>
+			<spinner label="E" name="Path Limit End"/>
+			<text name="text taper2">
+				Verjüngung
+			</text>
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
+			<text name="text radius delta">
+				Radius
+			</text>
+			<text name="text revolutions">
+				Umdrehungen
+			</text>
+			<spinner name="Radius Offset"/>
+			<texture_picker label="Textur für gestaltetes 
+Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+			<check_box label="Spiegeln" name="sculpt mirror control" tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln."/>
+			<check_box label="Wenden" name="sculpt invert control" tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen."/>
+			<text name="label sculpt type">
+				Naht
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(keiner)
+				</combo_item>
+				<combo_item name="Sphere">
+					Kugel
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Plane">
+					Fläche
+				</combo_item>
+				<combo_item name="Cylinder">
+					Zylinder
+				</combo_item>
+			</combo_box>
+		</panel>
+		<panel label="Eigenschaften" name="Features">
+			<text name="select_single">
+				Wählen Sie nur einen einzelnen Baustein aus, um Eigenschaften zu bearbeiten.
+			</text>
+			<text name="edit_object">
+				Objekteigenschaften bearbeiten:
+			</text>
+			<check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Gestattet, dass Objekt um die Z-Achse gebogen wird. (nur Client-Seite)"/>
+			<spinner label="Weichheit" name="FlexNumSections"/>
+			<spinner label="Schwerkraft" name="FlexGravity"/>
+			<spinner label="Ziehen" name="FlexFriction"/>
+			<spinner label="Wind" name="FlexWind"/>
+			<spinner label="Spannung" name="FlexTension"/>
+			<spinner label="Erzwingen X" name="FlexForceX"/>
+			<spinner label="Erzwingen Y" name="FlexForceY"/>
+			<spinner label="Erzwingen Z" name="FlexForceZ"/>
+			<check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/>
+			<text name="label color">
+				Farbe
+			</text>
+			<color_swatch label="" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<spinner label="Intensität" name="Light Intensity"/>
+			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="Abnehmend" name="Light Falloff"/>
+		</panel>
+		<panel label="Textur" name="Texture">
+			<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
+			<color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<text name="color trans">
+				Transparenz %
+			</text>
+			<text name="glow label">
+				Leuchten
+			</text>
+			<check_box label="Ganz hell" name="checkbox fullbright"/>
+			<text name="tex gen">
+				Zuordnung
+			</text>
+			<combo_box name="combobox texgen">
+				<combo_item name="Default">
+					Standard
+				</combo_item>
+				<combo_item name="Planar">
+					Eben
+				</combo_item>
+			</combo_box>
+			<text name="label shininess">
+				Glanz
+			</text>
+			<combo_box name="combobox shininess">
+				<combo_item name="None">
+					Kein
+				</combo_item>
+				<combo_item name="Low">
+					Niedrig
+				</combo_item>
+				<combo_item name="Medium">
+					Mittel
+				</combo_item>
+				<combo_item name="High">
+					Hoch
+				</combo_item>
+			</combo_box>
+			<text name="label bumpiness">
+				Holprigkeit
+			</text>
+			<combo_box name="combobox bumpiness">
+				<combo_item name="None">
+					Keine
+				</combo_item>
+				<combo_item name="Brightness">
+					Helligkeit
+				</combo_item>
+				<combo_item name="Darkness">
+					Dunkelheit
+				</combo_item>
+				<combo_item name="woodgrain">
+					Holzmaserung
+				</combo_item>
+				<combo_item name="bark">
+					Rinde
+				</combo_item>
+				<combo_item name="bricks">
+					Ziegel
+				</combo_item>
+				<combo_item name="checker">
+					Karo
+				</combo_item>
+				<combo_item name="concrete">
+					Beton
+				</combo_item>
+				<combo_item name="crustytile">
+					verkrustete Fliesen
+				</combo_item>
+				<combo_item name="cutstone">
+					Steinplatten
+				</combo_item>
+				<combo_item name="discs">
+					Scheiben
+				</combo_item>
+				<combo_item name="gravel">
+					Kies
+				</combo_item>
+				<combo_item name="petridish">
+					Petrischale
+				</combo_item>
+				<combo_item name="siding">
+					Verkleidung
+				</combo_item>
+				<combo_item name="stonetile">
+					Steinfliesen
+				</combo_item>
+				<combo_item name="stucco">
+					Stuck
+				</combo_item>
+				<combo_item name="suction">
+					Saugen
+				</combo_item>
+				<combo_item name="weave">
+					gewoben
+				</combo_item>
+			</combo_box>
+			<text name="tex scale">
+				Wiederholungen
+			</text>
+			<spinner label="Horizontal (U)" name="TexScaleU"/>
+			<check_box label="Umkehren" name="checkbox flip s"/>
+			<spinner label="Vertikal (V)" name="TexScaleV"/>
+			<check_box label="Umkehren" name="checkbox flip t"/>
+			<text name="tex rotate">
+				Rotation (Grad)
+			</text>
+			<string name="string repeats per meter">
+				Kacheln pro Meter
+			</string>
+			<string name="string repeats per face">
+				Wiederholungen pro Fläche
+			</string>
+			<text name="rpt">
+				Kacheln pro Meter
+			</text>
+			<button label="Übernehmen" label_selected="Übernehmen" name="button apply"/>
+			<text name="tex offset">
+				Versatz
+			</text>
+			<spinner label="Horizontal (U)" name="TexOffsetU"/>
+			<spinner label="Vertikal (V)" name="TexOffsetV"/>
+			<text name="textbox autofix">
+				Medientextur ausrichten
+(zuerst laden)
+			</text>
+			<button label="Ausrichten" label_selected="Ausrichten" name="button align"/>
+		</panel>
+		<panel label="Inhalt" name="Contents">
+			<button label="Neues Skript" label_selected="Neues Skript..." name="button new script"/>
+			<button label="Berechtigungen..." name="button permissions"/>
+		</panel>
+	</tab_container>
+	<panel name="land info panel">
+		<text name="label_parcel_info">
+			Parzelleninformation
+		</text>
+		<text name="label_area_price">
+			Preis: L$ [PRICE] für [AREA] m2.
+		</text>
+		<text name="label_area">
+			Fläche: [AREA] m2
+		</text>
+		<button label="Info zu Land..." label_selected="Info zu Land..." name="button about land"/>
+		<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen"/>
+		<button label="?" label_selected="?" name="button show owners help"/>
+		<text name="label_parcel_modify">
+			Parzelle ändern
+		</text>
+		<button label="Unterteilen..." label_selected="Unterteilen..." name="button subdivide land"/>
+		<button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land"/>
+		<text name="label_parcel_trans">
+			Land-Transaktionen
+		</text>
+		<button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land"/>
+		<button label="Land aufgeben..." label_selected="Land aufgeben..." name="button abandon land"/>
+	</panel>
+	<string name="status_rotate">
+		An den farbigen Bändern ziehen, um das Objekt zu drehen
+	</string>
+	<string name="status_scale">
+		Klicken und ziehen, um die ausgewählte Seite zu dehnen
+	</string>
+	<string name="status_move">
+		Maus verschiebt, Umschalt-Taste und Maus kopiert
+	</string>
+	<string name="status_modifyland">
+		Klicken und halten, um das Land zu bearbeiten
+	</string>
+	<string name="status_camera">
+		Klicken und ziehen, um die Ansicht zu ändern
+	</string>
+	<string name="status_grab">
+		Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg-Umschalt zum Drehen
+	</string>
+	<string name="status_place">
+		Inworld klicken, um zu bauen.
+	</string>
+	<string name="status_selectland">
+		Klicken und ziehen, um Land auszuwählen
+	</string>
+	<string name="grid_screen_text">
+		Bildschirm
+	</string>
+	<string name="grid_local_text">
+		Lokal
+	</string>
+	<string name="grid_world_text">
+		Welt
+	</string>
+	<string name="grid_reference_text">
+		Referenz
+	</string>
+	<string name="grid_attachment_text">
+		Anhang
+	</string>
+</floater>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="" short_title="Bauen">
 	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
 	<button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
@@ -623,3 +1251,5 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
 		Anhang
 	</string>
 </floater>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index ce19248755..2ce40e5787 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -47,6 +47,89 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 	<panel name="preferences_container">
 		<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
 		<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
+		<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+		<combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind.">
+			<combo_item name="select_mature">
+				- Mature wählen -
+			</combo_item>
+			<combo_item name="mature">
+				Mature-Inhalt
+			</combo_item>
+			<combo_item name="pg">
+				PG-Inhalt
+			</combo_item>
+		</combo_box>
+		<panel name="title_container">
+			<text name="active_title_label">
+				Mein aktiver Titel
+			</text>
+			<combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
+		</panel>
+		<check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/>
+		<check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
+	</panel>
+	<string name="incomplete_member_data_str">
+		Mitgliedsdaten werden abgerufen
+	</string>
+	<string name="confirm_group_create_str">
+		Die Gründung dieser Gruppe kostet 100 L$. 
+Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
+Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
+	</string>
+</panel>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Allgemein" name="general_tab">
+	<string name="help_text">
+		Die Registerkarte „Allgemein“ enthält Informationen über
+diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, 
+allgemeine Gruppeneinstellungen und Mitgliederoptionen.
+
+Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
+	</string>
+	<string name="group_info_unchanged">
+		Die allgemeine Gruppeninfo wurde geändert.
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>
+	<text name="group_name">
+		Neuen Gruppennamen hier eingeben
+	</text>
+	<text name="prepend_founded_by">
+		Gegründet von
+	</text>
+	<text left_delta="79" name="founder_name">
+		(wartet)
+	</text>
+	<text name="group_charter_label">
+		Gruppencharta
+	</text>
+	<texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+	<text_editor name="charter">
+		Gruppencharta
+	</text_editor>
+	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
+	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
+	<text name="text_owners_and_visible_members">
+		Eigentümer und sichtbare Mitglieder
+	</text>
+	<text name="text_owners_are_shown_in_bold">
+		(Eigentümer werden fettgedruckt angezeigt)
+	</text>
+	<name_list name="visible_members">
+		<column label="Mitgliedsname" name="name" relwidth="0.40"/>
+		<column label="Titel" name="title" relwidth="0.25"/>
+		<column label="Letzte Anmeldung" name="online" relwidth="0.35"/>
+	</name_list>
+	<text name="text_group_preferences">
+		Gruppeneinstellungen
+	</text>
+	<panel name="preferences_container">
+		<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
+		<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
 		<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/>
 		<spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
 		<combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind.">
@@ -78,3 +161,5 @@ Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gr
 Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
 	</string>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index c038d97822..e2e30b7479 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -52,6 +52,90 @@
 		qm (max. [AMOUNT])
 	</text>
 	<text name="group_over_limit_text">
+		Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann.
+	</text>
+	<text name="group_money_heading">
+		Gruppen-L$
+	</text>
+	<tab_container name="group_money_tab_container">
+		<panel label="Planung" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Wird berechnet...
+			</text_editor>
+		</panel>
+		<panel label="Details" name="group_money_details_tab">
+			<text_editor name="group_money_details_text">
+				Wird berechnet...
+			</text_editor>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_details_button" tool_tip="Zurück in der Zeit"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_details_button" tool_tip="Weiter in der Zeit"/>
+		</panel>
+		<panel label="Verkäufe" name="group_money_sales_tab">
+			<text_editor name="group_money_sales_text">
+				Wird berechnet...
+			</text_editor>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_sales_button" tool_tip="Zurück in der Zeit"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_sales_button" tool_tip="Weiter in der Zeit"/>
+		</panel>
+	</tab_container>
+</panel>
+
+<!--
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Land und L$" name="land_money_tab">
+	<string name="help_text">
+		Parzellen in Gruppenbesitz werden zusammen mit Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
+	</string>
+	<button label="?" name="help_button"/>
+	<string name="cant_view_group_land_text">
+		Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen.
+	</string>
+	<string name="cant_view_group_accounting_text">
+		Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen.
+	</string>
+	<string name="loading_txt">
+		Wird geladen...
+	</string>
+	<text name="group_land_heading">
+		Land in Gruppenbesitz
+	</text>
+	<scroll_list name="group_parcel_list">
+		<column label="Parzellenname" name="name"/>
+		<column label="Region" name="location"/>
+		<column label="Typ" name="type"/>
+		<column label="Gebiet" name="area"/>
+		<column label="" name="hidden"/>
+	</scroll_list>
+	<button label="Auf Karte" label_selected="Auf Karte" name="map_button"/>
+	<text name="total_contributed_land_label">
+		Gesamtbeitrag:
+	</text>
+	<text name="total_contributed_land_value">
+		[AREA] qm
+	</text>
+	<text name="total_land_in_use_label">
+		Insgesamt verwendetes Land:
+	</text>
+	<text name="total_land_in_use_value">
+		[AREA] qm
+	</text>
+	<text name="land_available_label">
+		Land verfügbar:
+	</text>
+	<text name="land_available_value">
+		[AREA] qm
+	</text>
+	<text name="your_contribution_label">
+		Ihr Beitrag:
+	</text>
+	<string name="land_contrib_error">
+		Ihr Landbeitrag kann nicht festgelegt werden.
+	</string>
+	<text name="your_contribution_max_value">
+		qm (max. [AMOUNT])
+	</text>
+	<text name="group_over_limit_text">
 		Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit
 das verwendete Land gehalten werden kann.
 	</text>
@@ -80,3 +164,5 @@ das verwendete Land gehalten werden kann.
 		</panel>
 	</tab_container>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 12dcbb1321..8d4afd356e 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -16,6 +16,81 @@ gesendet. Mitteilungen können unter
 		Gruppenmitteilungsarchiv
 	</text>
 	<text name="lbl2">
+		Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen. Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
+	</text>
+	<scroll_list name="notice_list">
+		<column label="" name="icon" />
+		<column label="Thema" name="subject" />
+		<column label="Von" name="from" />
+		<column label="Datum" name="date" />
+	</scroll_list>
+	<text name="notice_list_none_found">
+		Nicht gefunden.
+	</text>
+	<button label="Neue Mitteilung" label_selected="Neue Mitteilung"
+	     name="create_new_notice" />
+	<button label="Aktualisieren" label_selected="Liste aktualisieren"
+	     name="refresh_notices" />
+	<panel label="Neue Mitteilung" name="panel_create_new_notice">
+		<text name="lbl">
+			Mitteilung schreiben
+		</text>
+		<text name="lbl2">
+			Geben Sie einen Betreff für die Mitteilung ein. Sie können der Mitteilung ein Objekt anfügen, indem Sie es aus dem Inventar in dieses Feld ziehen. Angehängte Objekte müssen kopier-und transferierbar sein. Ordner können nicht gesendet werden.
+		</text>
+		<text name="lbl3">
+			Betreff:
+		</text>
+		<text name="lbl4">
+			Nachricht:
+		</text>
+		<text name="lbl5">
+			Anhängen:
+		</text>
+		<button label="Anhang entfernen" label_selected="Anhang entfernen"
+		     name="remove_attachment" />
+		<button label="Mitteilung senden" label_selected="Mitteilung senden" name="send_notice" />
+		<panel name="drop_target"
+		     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+	</panel>
+	<panel label="Ältere Notiz anzeigen" name="panel_view_past_notice">
+		<text name="lbl">
+			Archivierte Mitteilung
+		</text>
+		<text name="lbl2">
+			Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
+		</text>
+		<text name="lbl3">
+			Betreff:
+		</text>
+		<text name="lbl4">
+			Nachricht:
+		</text>
+		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" />
+	</panel>
+</panel>
+
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Mitteilungen" name="notices_tab">
+	<text name="help_text">
+		Mitteilungen sind eine schnelle Möglichkeit, 
+Mitglieder auf dem Laufenden zu halten und 
+Objekte im Anhang zu versenden. Mitteilungen werden
+nur an Mitglieder mit einer entsprechenden Rolle 
+gesendet. Mitteilungen können unter 
+„Allgemein“ ausgeschaltet werden.
+	</text>
+	<text name="no_notices_text">
+		Keine älteren Mitteilungen.
+	</text>
+	<button label="?" label_selected="?" name="help_button" />
+	<text name="lbl">
+		Gruppenmitteilungsarchiv
+	</text>
+	<text name="lbl2">
 		Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung,
 um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen.
 Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
@@ -74,3 +149,8 @@ und transferierbar sein. Ordner können nicht gesendet werden.
 		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" />
 	</panel>
 </panel>
+
+-->
+
+
+
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index d4589f83e4..d7f47de46f 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -12,8 +12,165 @@
 			Mitglieder und Rollen
 		</text>
 		<text name="static2">
-			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese 
-Einstellungen können zur flexibleren Organisation angepasst werden.
+			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden.
+		</text>
+	</panel>
+	<panel name="roles_header">
+		<text name="static">
+			Rollen
+		</text>
+		<text name="role_properties_modifiable">
+			Wählen Sie eine Rolle. Sie können ihren Namen, ihre Beschreibung und den Mitgliedstitel ändern.
+		</text>
+		<text name="role_properties_not_modifiable">
+			Rolle anklicken um Mitglieder und Fähigkeiten anzuzeigen.
+		</text>
+		<text name="role_actions_modifiable">
+			Sie können der Rolle auch Fähigkeiten zuweisen.
+		</text>
+		<text name="role_actions_not_modifiable">
+			Sie können zugewiesene Fähigkeiten anzeigen, aber nicht bearbeiten.
+		</text>
+	</panel>
+	<panel name="actions_header">
+		<text name="static">
+			Fähigkeiten
+		</text>
+		<text name="static2">
+			Sie können Fähigkeiten-Beschreibungen anzeigen und welche Rollen bzw. Mitglieder diese Fähigkeit haben.
+		</text>
+	</panel>
+	<tab_container name="roles_tab_container">
+		<panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<name_list name="member_list">
+				<column label="Mitgliedsname" name="name"/>
+				<column label="Übertragene Landanteile" name="donated"/>
+				<column label="Letzte Anmeldung" name="online"/>
+			</name_list>
+			<button label="Neues Mitglied einladen..." name="member_invite"/>
+			<button label="Aus Gruppe werfen" name="member_eject"/>
+			<string name="help_text">
+				Sie können Mitgliedern Rollen zuweisen und entziehen.
+Drücken Sie die Strg-Taste und klicken Sie auf Namen,
+um mehrere Mitglieder auszuwählen.
+			</string>
+		</panel>
+		<panel label="Rollen" name="roles_sub_tab">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<scroll_list name="role_list">
+				<column label="Rolle" name="name"/>
+				<column label="Titel" name="title"/>
+				<column label="Mitglieder" name="members"/>
+			</scroll_list>
+			<button label="Neue Rolle erstellen..." name="role_create"/>
+			<button label="Rolle löschen" name="role_delete"/>
+			<string name="help_text">
+				Rollen haben einen Titel und umfassen bestimmte
+Fähigkeiten. Mitglieder können mehrere 
+Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
+definieren, darunter „Jeder“ und „Eigentümer“.
+			</string>
+			<string name="cant_delete_role">
+				Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
+			</string>
+		</panel>
+		<panel label="Fähigkeiten" name="actions_sub_tab">
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
+			<scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
+				<column label="" name="icon"/>
+				<column label="" name="action"/>
+			</scroll_list>
+			<string name="help_text">
+				Fähigkeiten verleihen Mitgliedern in Rollen bestimmte
+Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
+			</string>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			Rollen
+		</text>
+		<text name="static2">
+			Zulässige Fähigkeiten
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<column label="" name="checkbox"/>
+			<column label="" name="role"/>
+		</scroll_list>
+		<scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Name
+		</text>
+		<text name="static2">
+			Beschreibung
+		</text>
+		<line_editor name="role_name">
+			Angestellte
+		</line_editor>
+		<text name="static3">
+			Titel
+		</text>
+		<line_editor name="role_title">
+			(wartet)
+		</line_editor>
+		<text_editor name="role_description">
+			(wartet)
+		</text_editor>
+		<text name="static4">
+			Mitglieder in Rolle
+		</text>
+		<text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
+			Zulässige Fähigkeiten
+		</text>
+		<check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+		<scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Beschreibung
+		</text>
+		<text_editor name="action_description">
+			Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
+		</text_editor>
+		<text name="static2">
+			Rollen mit Fähigkeit
+		</text>
+		<text name="static3">
+			Mitglieder mit Fähigkeit
+		</text>
+	</panel>
+</panel>
+
+<!-- original file
+
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Mitglieder und Rollen" name="roles_tab">
+	<string name="default_needs_apply_text">
+		Das Unterregister enthält nicht übernommene Änderungen.
+	</string>
+	<string name="want_apply_text">
+		Diese Änderungen übernehmen?
+	</string>
+	<button label="?" name="help_button"/>
+	<panel name="members_header">
+		<text name="static">
+			Mitglieder und Rollen
+		</text>
+		<text name="static2">
+			Gruppenmitgliedern werden Rollen mit Fähigkeiten zugewiesen. Diese Einstellungen können zur flexibleren Organisation angepasst werden.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -155,3 +312,5 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 		</text>
 	</panel>
 </panel>
+
+-->
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 59d0d45425..2f585d5974 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -4,7 +4,7 @@
  height="556"
  layout="topleft"
  name="Animation Preview"
- width="300">
+ width="280">
     <floater.string
      name="failed_to_initialize">
         Failed to initialize motion
@@ -385,7 +385,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="0.01"
      initial_value="0"
      label="Ease In (sec)"
-     label_width="65"
+     label_width="75"
      layout="topleft"
      left="10"
      max_val="10"
@@ -399,14 +399,14 @@ Maximum animation length is [MAX_LENGTH] seconds.
      increment="0.01"
      initial_value="0"
      label="Ease Out (sec)"
-     label_width="75"
+     label_width="80"
      layout="topleft"
-     left_pad="15"
+     left_pad="10"
      max_val="10"
      name="ease_out_time"
      tool_tip="Amount of time (in seconds) over which animations blends out."
      top_delta="0"
-     width="135" />
+     width="130" />
     <button
      follows="top|right"
      height="28"
@@ -440,7 +440,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
      layout="topleft"
      left="80"
      name="playback_slider"
-     right="290"
+     right="275"
      show_text="false" />
     <text
      type="string"
@@ -461,7 +461,7 @@ We recommend BVH files exported from Poser 4.
      label="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="290"
+     right="265"
      width="123" />
     <button
      follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index cf75da078e..6d7e3a9c45 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_tear_off="false"
- height="340"
+ height="360"
  layout="topleft"
  name="floaterbulkperms"
  title="Bulk change content permissions"
- width="480">
+ width="280">
     <floater.string
      name="nothing_to_modify_text">
         Selection contains no editable contents.
@@ -242,7 +242,7 @@
      font="SansSerif"
      height="10"
      layout="topleft"
-     left="165"
+     left="140"
      name="newperms"
      top="30"
      width="206">
@@ -253,7 +253,7 @@
      height="16"
      label="Share with group"
      layout="topleft"
-     left="170"
+     left="140"
      name="share_with_group"
      top="54"
      width="106" />
@@ -303,27 +303,27 @@
      initial_value="true"
      label="Resell/Give away"
      layout="topleft"
-     left_delta="88"
+     left="145"
      name="next_owner_transfer"
-     top_delta="0"
+     top_delta="20"
      width="106" />
     <scroll_list
      enabled="false"
      follows="left|top|right|bottom"
      height="130"
      layout="topleft"
-     left="130"
+     left="120"
      name="queue output"
-     top="170"
-     width="335" />
+     top="185"
+     width="150" />
     <button
      follows="left|top"
      height="20"
      label="Apply"
      layout="topleft"
-     left="265"
+     left="65"
      name="apply"
-     top="310"
+     top_pad="10"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 174337480a..22db78a309 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -8,7 +8,7 @@
  name="floater_buy_contents"
  save_rect="true"
  title="Buy Contents"
- width="300">
+ width="280">
     <floater.string
      name="no_copy_text">
         (no copy)
@@ -41,7 +41,7 @@
      left_delta="0"
      name="item_list"
      top_pad="4"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
@@ -68,7 +68,7 @@
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left="216"
+     left="211"
      name="cancel_btn"
      top="224"
      width="60" />
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 44ef32ee36..499fcf5a8a 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -8,7 +8,7 @@
  name="contents"
  save_rect="true"
  title="Buy Copy of Object"
- width="300">
+ width="280">
     <floater.string
      name="title_buy_text">
         Buy
@@ -36,13 +36,13 @@
      left="15"
      name="object_list"
      top="24"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
         <scroll_list.columns
          name="text"
-         width="300" />
+         width="234" />
     </scroll_list>
     <text
      type="string"
@@ -54,7 +54,7 @@
      left_delta="0"
      name="contents_text"
      top_pad="4"
-     width="281">
+     width="250">
         and its contents:
     </text>
     <scroll_list
@@ -64,13 +64,13 @@
      left_delta="0"
      name="item_list"
      top_pad="4"
-     width="281">
+     width="250">
         <scroll_list.columns
          name="icon"
          width="16" />
         <scroll_list.columns
          name="text"
-         width="300" />
+         width="234" />
     </scroll_list>
     <text
      type="string"
@@ -91,7 +91,7 @@
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left="216"
+     left="211"
      name="cancel_btn"
      top="224"
      width="60" />
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index c4d024ae8b..9751ae970b 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -4,10 +4,10 @@
  height="465"
  layout="topleft"
  min_height="200"
- min_width="350"
+ min_width="280"
  name="gestures"
  title="Active Gestures"
- width="350">
+ width="280">
     <floater.string
      name="loading">
         Loading...
@@ -24,7 +24,7 @@
      layout="topleft"
      left="15"
      name="help_label">
-        Double-click a gesture to play animations and sounds.
+        Double-click a gesture to play.
     </text>
     <scroll_list
      bottom_delta="390"
@@ -36,21 +36,21 @@
      name="gesture_list"
      right="-15">
         <scroll_list.columns
+         label="Name"
+         name="name"
+         width="105" />
+        <scroll_list.columns
          label="Trigger"
          name="trigger"
          width="70" />
-        <scroll_list.columns
-         label="Key"
-         name="shortcut"
-         width="70" />
-        <scroll_list.columns
+       <scroll_list.columns
          label=""
          name="key"
          width="-1" />
         <scroll_list.columns
-         label="Name"
-         name="name"
-         width="160" />
+         label="Key"
+         name="shortcut"
+         width="50" />
     </scroll_list>
     <button
      follows="bottom|right"
@@ -89,3 +89,4 @@
      top_delta="0"
      width="83" />
 </floater>
+
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index 7493a9a90d..e8b8fee678 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -24,7 +24,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="muted_message">
-        You have muted this resident. Sending a message will automatically unmute them.
+        You have blocked this resident. Sending a message will automatically unblock them.
     </multi_floater.string>
     <multi_floater.string
      name="generic_request_error">
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 8bff916f9d..f07a146471 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -5,7 +5,7 @@
  layout="topleft"
  name="Inventory Finder"
  title="inventory_recent_items"
- width="160">
+ width="280">
     <icon
      height="16"
      image_name="inv_item_animation.tga"
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 0ed4bb4e07..faf14575e4 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="383"
+ height="400"
  layout="topleft"
  name="land holdings floater"
  title="My Land"
- width="600">
+ width="280">
     <floater.string
      name="area_string">
         [AREA] sq. meters
@@ -16,23 +16,23 @@
      left="8"
      name="parcel list"
      top="24"
-     width="584">
+     width="270">
         <scroll_list.columns
-         label="Parcel Name"
+         label="Parcel"
          name="name"
-         width="163" />
+         width="69" />
         <scroll_list.columns
          label="Region"
          name="location"
-         width="175" />
+         width="74" />
         <scroll_list.columns
          label="Type"
          name="type"
-         width="140" />
+         width="55" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="87" />
+         width="10" />
         <scroll_list.columns
          label=""
          name="hidden"
@@ -40,6 +40,7 @@
     </scroll_list>
     <button
      height="20"
+     font="SansSerifSmall"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -50,6 +51,7 @@
      width="100" />
     <button
      height="20"
+     font="SansSerifSmall"
      label="Show on Map"
      label_selected="Show on Map"
      layout="topleft"
@@ -77,15 +79,15 @@
      left_delta="-4"
      name="grant list"
      top_pad="4"
-     width="584">
+     width="270">
         <scroll_list.columns
          label="Group"
          name="group"
-         width="330" />
+         width="125" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="220" />
+         width="125" />
     </scroll_list>
     <text
      type="string"
@@ -96,8 +98,9 @@
      left_delta="4"
      name="allowed_label"
      top_pad="4"
-     width="348">
-        Allowed land holdings at current payment plan:
+     width="150">
+        Allowed land holdings at
+current payment plan:
     </text>
     <text
      type="string"
@@ -105,9 +108,9 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="allowed_text"
-     top_delta="0"
+     top_delta="10"
      width="132">
         [AREA] sq. meters
     </text>
@@ -119,8 +122,8 @@
      layout="topleft"
      left="12"
      name="current_label"
-     top="341"
-     width="348">
+     top_pad="5"
+     width="150">
         Current land holdings:
     </text>
     <text
@@ -129,7 +132,7 @@
      follows="left|top"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="current_text"
      top_delta="0"
      width="132">
@@ -144,9 +147,10 @@
      layout="topleft"
      left="12"
      name="available_label"
-     top="361"
-     width="348">
-        Available for land purchases:
+     top_pad="5"
+     width="150">
+        Available for land
+purchases:
     </text>
     <text
      type="string"
@@ -155,10 +159,10 @@
      font="SansSerifBold"
      height="16"
      layout="topleft"
-     left_delta="340"
+     left_pad="5"
      name="available_text"
-     top_delta="0"
+     top_delta="5"
      width="140">
         [AREA] sq. meters
     </text>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 7a0ec8282c..6b6b2c80ba 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -4,7 +4,7 @@
  height="140"
  layout="topleft"
  name="mute by name"
- title="Mute object by name"
+ title="Block object by name"
  width="375">
     <text
      type="string"
@@ -18,7 +18,7 @@
      left_delta="25"
      name="message"
      right="380">
-        Mute by name only affects object chat and IM, not sounds.
+        Block by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
     </text>
     <line_editor
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 1760d5b818..55ae3ee2b0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -48,31 +48,6 @@
         <button.commit_callback
          function="Pref.Apply" />
     </button>
-    <button
-     follows="left|bottom"
-     height="20"
-     label="About"
-     label_selected="About"
-     layout="topleft"
-     left_delta="-512"
-     name="About..."
-     top_delta="0"
-     width="90">
-        <button.commit_callback
-         function="Floater.Show"
-         parameter="sl_about" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="20"
-     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
-     label="Help"
-     label_selected="Help"
-     layout="topleft"
-     left_pad="3"
-     name="Help"
-     top_delta="0"
-     width="90" />
     <tab_container
      follows="left|top|right|bottom"
      height="410"
@@ -91,64 +66,114 @@
          layout="topleft"
          name="general" />
         <panel
+         filename="panel_preferences_graphics1.xml"
+         label="Graphics"
+         layout="topleft"
+         name="display" />
+        <panel
 		 class="panel_preference"
-         filename="panel_preferences_input.xml"
-         label="Input &amp; Camera"
+         filename="panel_preferences_im.xml"
+         label="Privacy"
          layout="topleft"
-         name="input" />
+         name="im" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_network.xml"
-         label="Network"
+         filename="panel_preferences_audio.xml"
+         label="Sound"
          layout="topleft"
-         name="network" />
+         name="audio" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_web.xml"
-         label="Web"
+         filename="panel_preferences_chat.xml"
+         label="Chat"
          layout="topleft"
-         name="web" />
+         name="chat" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_graphics1.xml"
-         label="Graphics"
+         filename="panel_preferences_popups.xml"
+         label="Alerts"
          layout="topleft"
-         name="display" />
+         name="msgs" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_audio.xml"
-         label="Audio &amp; Video"
+         filename="panel_preferences_input.xml"
+         label="Setup"
          layout="topleft"
-         name="audio" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_chat.xml"
-         label="Text Chat"
+         filename="panel_preferences_advanced.xml"
+         label="Advanced"
          layout="topleft"
-         name="chat" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_voice.xml"
-         label="Voice Chat"
+         filename="panel_preferences_advanced2.xml"
+         label="Move, not to Advanced"
          layout="topleft"
-         name="voice" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_im.xml"
-         label="Communication"
+         filename="panel_preferences_advanced3.xml"
+         label="Not in specs"
          layout="topleft"
-         name="im" />
+         name="input" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_popups.xml"
-         label="Popups"
+         filename="panel_preferences_advanced4.xml"
+         label="Storage/Kill"
          layout="topleft"
-         name="msgs" />
+         name="input" />
+        <!--panel
+		 class="panel_preference"
+         filename="panel_preferences_network.xml"
+         label="Network"
+         layout="topleft"
+         name="network" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_web.xml"
+         label="Web"
+         layout="topleft"
+         name="web" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_voice.xml"
+         label="Voice Chat"
+         layout="topleft"
+         name="voice" />
         <panel
 		 class="panel_preference"
          filename="panel_preferences_skins.xml"
          label="Skins"
          layout="topleft"
-         name="skins" />
+         name="skins" /-->
     </tab_container>
+    
+        <!--button
+     follows="left|bottom"
+     height="20"
+     label="About"
+     label_selected="About"
+     layout="topleft"
+     left_delta="-512"
+     name="About..."
+     top_delta="0"
+     width="90">
+        <button.commit_callback
+         function="Floater.Show"
+         parameter="sl_about" />
+    </button-->
+    <!--bottom"
+     height="20"
+     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
+     label="Help"
+     label_selected="Help"
+     layout="topleft"
+     left_pad="3"
+     name="Help"
+     top_delta="0"
+     width="90" /-->
+
+    
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 50aabfc895..36accdfc77 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -4,7 +4,7 @@
  height="85"
  layout="topleft"
  name="preview_anim"
- width="300">
+ width="280">
     <floater.string
      name="Title">
         Animation: [NAME]
@@ -13,14 +13,14 @@
      border_style="line"
      border_thickness="1"
      follows="left|top|right"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="19"
      layout="topleft"
      left="93"
      max_length="127"
      name="desc"
      top="19"
-     width="194" />
+     width="127" />
     <text
      type="string"
      length="1"
@@ -36,16 +36,18 @@
     </text>
     <button
      height="19"
+     font="SansSerifSmall"
      label="Play in World"
      label_selected="Stop"
      layout="topleft"
-     left="27"
+     left="20"
      name="Anim play btn"
      tool_tip="Play this animation so that others can see it."
      top="47"
      width="96" />
     <button
      height="19"
+     font="SansSerifSmall"
      label="Play Locally"
      label_selected="Stop"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 9d183d8103..a463b2274d 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  auto_tile="true"
- height="350"
+ height="400"
  layout="topleft"
  name="gesture_preview"
- width="450">
+ width="280">
     <floater.string
      name="step_anim">
         Animation to play:
@@ -41,10 +41,10 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="desc_label"
      top="25"
      width="100">
@@ -57,15 +57,15 @@
      left_delta="84"
      name="desc"
      top_delta="-4"
-     width="330" />
+     width="180" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="trigger_label"
      top="54"
      width="100">
@@ -79,18 +79,18 @@
      max_length="31"
      name="trigger_editor"
      top_delta="-4"
-     width="105" />
+     width="100" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left_pad="15"
+     left="10"
      name="replace_text"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
-     top_delta="4"
+     top="79"
      width="200">
         Replace with:
     </text>
@@ -98,7 +98,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="80"
+     left_delta="84"
      max_length="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
@@ -108,12 +108,12 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="key_label"
-     top="83"
+     top="104"
      width="100">
         Shortcut Key:
     </text>
@@ -137,12 +137,12 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left="16"
+     left="10"
      name="library_label"
-     top="112"
+     top="135"
      width="100">
         Library:
     </text>
@@ -150,10 +150,10 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="10"
      layout="topleft"
-     left_pad="104"
+     left_pad="75"
      name="steps_label"
      top_delta="0"
      width="100">
@@ -163,10 +163,10 @@
      follows="top|left"
      height="110"
      layout="topleft"
-     left="16"
+     left="10"
      name="library_list"
-     top="132"
-     width="100">
+     top="150"
+     width="80">
         <scroll_list.rows
          value="Animation" />
         <scroll_list.rows
@@ -179,57 +179,61 @@
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Add &gt;&gt;"
      layout="topleft"
      left_pad="14"
      name="add_btn"
      top_delta="0"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
-     label="Move Up"
+     font="SansSerifSmall"
+     label="Up"
      layout="topleft"
      left_delta="0"
      name="up_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
-     label="Move Down"
+     font="SansSerifSmall"
+     label="Down"
      layout="topleft"
      left_delta="0"
      name="down_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Remove"
      layout="topleft"
      left_delta="0"
      name="delete_btn"
      top_pad="10"
-     width="80" />
+     width="70" />
     <scroll_list
      follows="top|left"
      height="110"
      layout="topleft"
-     left="220"
+     left="185"
      name="step_list"
-     top="132"
-     width="210" />
+     top="150"
+     width="85" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="60"
      layout="topleft"
-     left="16"
+     left="10"
      name="help_label"
-     top="252"
+     top="270"
      width="200">
         All steps happen simultaneously, 
 unless you add wait steps.
@@ -238,9 +242,9 @@ unless you add wait steps.
      follows="top|left"
      height="60"
      layout="topleft"
-     left_pad="6"
+     left="10"
      name="options_text"
-     top_delta="0"
+     top="300"
      width="205" />
     <combo_box
      follows="top|left"
@@ -248,7 +252,7 @@ unless you add wait steps.
      layout="topleft"
      left_delta="10"
      name="animation_list"
-     top="272"
+     top="320"
      width="100" />
     <combo_box
      follows="top|left"
@@ -298,9 +302,9 @@ unless you add wait steps.
      height="20"
      label="until animations are done"
      layout="topleft"
-     left="232"
+     left="16"
      name="wait_anim_check"
-     top="267"
+     top="315"
      width="100" />
     <check_box
      follows="top|left"
@@ -325,10 +329,10 @@ unless you add wait steps.
      height="20"
      label="Active"
      layout="topleft"
-     left="140"
+     left="20"
      name="active_check"
      tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict."
-     top="323"
+     top="365"
      width="100" />
     <button
      follows="top|left"
@@ -348,4 +352,4 @@ unless you add wait steps.
      name="save_btn"
      top_delta="0"
      width="80" />
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 07a50ac589..19f21090ca 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
@@ -4,7 +4,7 @@
  height="85"
  layout="topleft"
  name="preview_sound"
- width="300">
+ width="280">
     <floater.string
      name="Title">
         Sound: [NAME]
@@ -16,11 +16,11 @@
      font="SansSerif"
      height="19"
      layout="topleft"
-     left="95"
+     left="85"
      max_length="127"
      name="desc"
      top="19"
-     width="192" />
+     width="127" />
     <text
      type="string"
      length="1"
@@ -28,7 +28,7 @@
      font="SansSerif"
      height="19"
      layout="topleft"
-     left_delta="-82"
+     left="10"
      name="desc txt"
      top_delta="0"
      width="80">
@@ -37,10 +37,11 @@
     <button
      follows="left|top"
      height="19"
+     font="SansSerifSmall"
      label="Play Locally"
      label_selected="Play Locally"
      layout="topleft"
-     left="168"
+     left="145"
      name="Sound audition btn"
      sound_flags="0"
      tool_tip="Play this sound so that only you can hear it."
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 48694e5fb6..a890de3e28 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -5,7 +5,7 @@
  name="regioninfo"
  save_rect="true"
  title="Region/Estate"
- width="480">
+ width="280">
     <tab_container
      bottom="512"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 26c805c0f7..2b6f2d5dde 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_minimize="false"
- height="485"
+ height="600"
  layout="topleft"
  name="sell land"
  title="Sell Land"
- width="450">
+ width="280">
     <texture_picker
      enabled="false"
      follows="top|left"
      height="135"
      layout="topleft"
-     left="244"
+     left="50"
      name="info_image"
-     right="424"
-     top="40"
+     right="230"
+     top="20"
      width="180" />
     <text
      type="string"
      length="1"
-     bottom_delta="-144"
+     top="145"
      follows="top|left"
      layout="topleft"
      left="16"
@@ -67,13 +67,13 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifHuge"
+     font="SansSerifBig"
      height="24"
      layout="topleft"
      left="16"
      name="info_action"
      text_color="white"
-     top="141"
+     top="190"
      width="200">
         To sell this parcel:
     </text>
@@ -84,14 +84,14 @@
      layout="topleft"
      left="0"
      name="step_price"
-     top="167"
+     top="211"
      width="64" />
     <text
      type="string"
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -108,7 +108,7 @@
      left="72"
      name="price_text"
      right="-20">
-        Choose an appropriate price for this land.
+        Choose an appropriate price.
     </text>
     <text
      type="string"
@@ -137,9 +137,9 @@
      length="1"
      height="16"
      layout="topleft"
-     left_pad="10"
+     left="72"
      name="price_per_m"
-     top_delta="0"
+     top_delta="25"
      width="200">
         (L$[PER_METER] per square meter)
     </text>
@@ -156,7 +156,7 @@
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -173,7 +173,8 @@
      left="72"
      name="sell_to_text"
      right="-20">
-        Choose whether to sell to anyone or a particular buyer.
+        Choose whether to sell to anyone
+or a particular buyer.
     </text>
     <combo_box
      follows="top|right"
@@ -181,8 +182,8 @@
      layout="topleft"
      left_delta="0"
      name="sell_to"
-     top_delta="16"
-     width="140">
+     top_delta="32"
+     width="130">
         <combo_box.item
          enabled="false"
          label="select one --"
@@ -202,10 +203,11 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="150" />
+     width="130" />
     <button
      height="16"
-     label="Select..."
+     font="SansSerifSmall"
+     label="Select"
      layout="topleft"
      left_pad="5"
      name="sell_to_select_agent"
@@ -224,7 +226,7 @@
      length="1"
      bottom_delta="-38"
      follows="top|left"
-     font="SansSerifBig"
+     font="SansSerif"
      height="16"
      layout="topleft"
      left="72"
@@ -235,16 +237,18 @@
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      bottom_delta="20"
      follows="top|left"
      height="16"
      layout="topleft"
      left="72"
      name="sell_objects_text">
-        Land owner&apos;s transferable objects on parcel will change ownership.
+        Land owner&apos;s transferable objects
+on parcel will change ownership.
     </text>
     <radio_group
-     bottom_delta="44"
+     top_pad="15"
      follows="top|right"
      height="40"
      layout="topleft"
@@ -275,21 +279,22 @@
     </radio_group>
     <button
      height="16"
+     font="SansSerifSmall"
      label="Show Objects"
      layout="topleft"
      name="show_objects"
-     right="414"
-     top="393"
+     left="100"
+     top_pad="10"
      width="110" />
     <text
      type="string"
      length="1"
-     bottom_delta="35"
+     bottom_delta="30"
      follows="top|left"
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left="72"
+     left="16"
      name="nag_message_label"
      right="-20">
         REMEMBER: All sales are final.
@@ -297,19 +302,21 @@
     <button
      follows="bottom|left"
      height="20"
+     font="SansSerifSmall"
      label="Set Land For Sale"
      layout="topleft"
      left_delta="0"
      name="sell_btn"
-     top_pad="15"
+     top_pad="10"
      width="130" />
     <button
      follows="bottom|right"
      height="20"
+     font="SansSerifSmall"
      label="Cancel"
      layout="topleft"
-     left_pad="152"
+     left_pad="30"
      name="cancel_btn"
      top_delta="0"
      width="90" />
-</floater>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index bcec046456..ef9aef7f6f 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -4,7 +4,7 @@
  layout="topleft"
  name="telehub"
  title="Telehub"
- width="272">
+ width="280">
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 5a17ffefac..021474d7ab 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -69,15 +69,4 @@
      name="font_checkbox"
      top_pad="14"
      width="150" />
-    <check_box
-     height="16"
-     label="Custom Button"
-     layout="topleft"
-     left_delta="0"
-     name="check_button_checkbox"
-     top_pad="14"
-     width="150">
-        <check_box.check_button
-         image_unselected="close_in_blue.tga" />
-    </check_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
new file mode 100644
index 0000000000..21956c2eac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="200"
+ layout="topleft"
+ name="floater_test_navigation_bar"
+ width="900">
+  <panel
+    name="navigation_bar"
+    filename="panel_navigation_bar.xml"
+    left="10"
+    right="-10" 
+    top="30"
+    height="100"
+    border="true"
+      />           
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 17b73b47ab..83cbbd410b 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- follows="left|top"
- height="550"
+ follows="left|top|right"
+ height="615"
  layout="topleft"
  name="toolbox floater"
  save_rect="true"
- short_title="Build"
+ short_title="Build Tools"
  single_instance="true"
  sound_flags="0"
- width="272">
+ width="280">
     <floater.string
      name="status_rotate">
         Drag colored bands to rotate object
@@ -69,11 +69,10 @@
      image_selected="tool_zoom_active.tga"
      image_unselected="tool_zoom.tga"
      layout="topleft"
-     left="4"
+     left="10"
      name="button focus"
      picture_style="true"
      tool_tip="Focus"
-     top="2"
      width="32" />
     <button
      follows="left|top"
@@ -83,11 +82,10 @@
      image_selected="tool_grab_active.tga"
      image_unselected="tool_grab.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button move"
      picture_style="true"
      tool_tip="Move"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -97,11 +95,10 @@
      image_selected="tool_face_active.tga"
      image_unselected="tool_face.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button edit"
      picture_style="true"
      tool_tip="Edit"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -111,11 +108,10 @@
      image_selected="tool_create_active.tga"
      image_unselected="tool_create.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button create"
      picture_style="true"
      tool_tip="Create"
-     top_delta="0"
      width="32" />
     <button
      follows="left|top"
@@ -125,158 +121,128 @@
      image_selected="tool_dozer_active.tga"
      image_unselected="tool_dozer.tga"
      layout="topleft"
-     left_pad="4"
+     left_pad="8"
      name="button land"
      picture_style="true"
      tool_tip="Land"
-     top_delta="0"
      width="32" />
-    <slider_bar
+    <text
+     type="string"
+     text_color="LabelSelectedDisabledColor"
+     length="1"
      follows="left|top"
-     height="14"
-     increment="0.01"
-     initial_value="0.125"
      layout="topleft"
-     left="114"
-     max_val="0.5"
-     name="slider zoom"
-     top="55"
-     width="134" />
-    <radio_group
-     draw_border="false"
-     height="45"
+     left="8"
+     name="text status"
+     top_pad="3"
+     width="280">
+        Drag to move, shift-drag to copy
+    </text>
+   <radio_group
      layout="topleft"
-     left_delta="-110"
-     name="focus_radio_group"
-     top_delta="0"
-     width="114">
+     left="10"
+      height="70"
+      top="54"
+     name="focus_radio_group">
         <radio_item
-         height="16"
+         top_pad="6"
          label="Zoom"
          layout="topleft"
-         left="0"
-         name="radio zoom"
-         top="-1"
-         width="114" />
+         name="radio zoom" />
         <radio_item
-         height="16"
+         top_pad="6"
          label="Orbit (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio orbit"
-         top_delta="15"
-         width="114" />
+         name="radio orbit" />
         <radio_item
-         height="16"
+         top_pad="6"
          label="Pan (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio pan"
-         top_delta="15"
-         width="114" />
+         name="radio pan" />
     </radio_group>
-    <radio_group
-     draw_border="false"
-     height="45"
+   <slider_bar
+     follows="left|top"
+     height="14"
+     increment="0.01"
+     initial_value="0.125"
      layout="topleft"
-     left_delta="0"
-     name="move_radio_group"
-     top_delta="0"
-     width="114">
+     max_val="0.5"
+     top_delta="-2"
+     left_delta="100"
+     name="slider zoom"
+     width="134" />
+   <radio_group
+      left="10"
+      height="70"
+      top="54"
+     layout="topleft"
+     name="move_radio_group">
         <radio_item
-         height="16"
+      top_pad="6"
          label="Move"
          layout="topleft"
-         left="0"
-         name="radio move"
-         top="-1"
-         width="114" />
+         name="radio move" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Lift (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio lift"
-         top_delta="15"
-         width="114" />
+         name="radio lift" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Spin (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio spin"
-         top_delta="15"
-         width="114" />
-    </radio_group>
+         name="radio spin" />
+   </radio_group>
     <radio_group
-     draw_border="false"
-     height="60"
+     follows="left|top"
+      left="10"
+      top="54"
+      height="70"
      layout="topleft"
-     left_delta="0"
-     name="edit_radio_group"
-     top_delta="0"
-     width="114">
+     name="edit_radio_group">
         <radio_item
-         height="16"
-         label="Position"
+         label="Move"
          layout="topleft"
-         left="0"
-         name="radio position"
-         top="-1"
-         width="114" />
+         name="radio position" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Rotate (Ctrl)"
          layout="topleft"
-         left_delta="0"
-         name="radio rotate"
-         top_delta="15"
-         width="114" />
+         name="radio rotate" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Stretch (Ctrl-Shift)"
          layout="topleft"
-         left_delta="0"
-         name="radio stretch"
-         top_delta="15"
-         width="123" />
+         name="radio stretch" />
         <radio_item
-         height="16"
+      top_pad="6"
          label="Select Texture"
          layout="topleft"
-         left_delta="0"
-         name="radio select face"
-         top_delta="15"
-         width="114" />
+         name="radio select face" />
     </radio_group>
     <check_box
-     control_name="EditLinkedParts"
-     height="16"
-     label="Edit linked parts"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox edit linked parts"
-     top_pad="3"
-     width="114" />
-    <text
-     type="string"
-     length="1"
+      left="10"
      follows="left|top"
-     height="14"
+      control_name="EditLinkedParts"
+     label="Edit linked prims"
      layout="topleft"
-     left_delta="2"
-     name="text ruler mode"
-     top_pad="6"
-     width="68">
+     name="checkbox edit linked parts" />
+    <text
+      left="10"
+      type="string"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      name="text ruler mode">
         Ruler:
     </text>
     <combo_box
-     height="20"
+     height="19"
+      left="30"
      layout="topleft"
-     left_delta="40"
+     follows="left|top"
      name="combobox grid mode"
-     top_delta="-2"
-     width="86">
+     width="90">
         <combo_box.item
          label="World"
          value="World" />
@@ -289,57 +255,42 @@
     </combo_box>
     <check_box
      control_name="ScaleUniform"
-     height="16"
+     height="19"
      label="Stretch Both Sides"
      layout="topleft"
      left="143"
      name="checkbox uniform"
-     top="54"
+      top="54"
      width="134" />
     <check_box
      control_name="ScaleStretchTextures"
-     height="16"
+     height="19"
      initial_value="true"
      label="Stretch Textures"
      layout="topleft"
-     left_delta="0"
      name="checkbox stretch textures"
      top_pad="1"
      width="134" />
     <check_box
      control_name="SnapEnabled"
-     height="16"
+     height="19"
      initial_value="true"
      label="Use Grid"
      layout="topleft"
-     left_delta="0"
      name="checkbox snap to grid"
      top_pad="1"
      width="134" />
     <button
      follows="left|top"
      font="SansSerifSmall"
-     height="20"
+     height="19"
+     left_delta="40"
+     top_delta="20"
      label="Options..."
      label_selected="Options..."
      layout="topleft"
-     left_delta="20"
      name="Options..."
-     top="103"
-     valign="center"
-     width="80" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="4"
-     name="text status"
-     top="36"
-     width="264">
-        Drag to move, shift-drag to copy
-    </text>
+     width="78" /> 
     <button
      follows="left|top"
      height="24"
@@ -348,11 +299,11 @@
      image_selected="object_cube_active.tga"
      image_unselected="object_cube.tga"
      layout="topleft"
-     left_delta="0"
+     left="4"
      name="ToolCube"
      picture_style="true"
      tool_tip="Cube"
-     top_delta="15"
+     top="51"
      width="24" />
     <button
      follows="left|top"
@@ -552,8 +503,8 @@
      width="24" />
     <check_box
      control_name="CreateToolKeepSelected"
-     height="16"
-     label="Keep selected"
+     height="19"
+     label="Keep Tool selected"
      layout="topleft"
      left="4"
      name="checkbox sticky"
@@ -561,8 +512,8 @@
      width="128" />
     <check_box
      control_name="CreateToolCopySelection"
-     height="16"
-     label="Copy selected"
+     height="19"
+     label="Copy selection"
      layout="topleft"
      left_delta="0"
      name="checkbox copy selection"
@@ -570,9 +521,9 @@
      width="134" />
     <check_box
      control_name="CreateToolCopyCenters"
-     height="16"
+     height="19"
      initial_value="true"
-     label="Center"
+     label="Center Copy"
      layout="topleft"
      left_delta="18"
      name="checkbox copy centers"
@@ -580,15 +531,14 @@
      width="134" />
     <check_box
      control_name="CreateToolCopyRotates"
-     height="16"
-     label="Rotate"
+     height="19"
+     label="Rotate Copy"
      layout="topleft"
      left_delta="0"
      name="checkbox copy rotates"
      top_delta="16"
      width="134" />
     <radio_group
-     draw_border="false"
      height="105"
      layout="topleft"
      left="4"
@@ -596,7 +546,7 @@
      top="54"
      width="114">
         <radio_item
-         height="16"
+         height="19"
          label="Select Land"
          layout="topleft"
          left="0"
@@ -604,7 +554,7 @@
          top="-1"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Flatten"
          layout="topleft"
          left_delta="0"
@@ -612,7 +562,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Raise"
          layout="topleft"
          left_delta="0"
@@ -620,7 +570,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Lower"
          layout="topleft"
          left_delta="0"
@@ -628,7 +578,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Smooth"
          layout="topleft"
          left_delta="0"
@@ -636,7 +586,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Roughen"
          layout="topleft"
          left_delta="0"
@@ -644,7 +594,7 @@
          top_delta="15"
          width="114" />
         <radio_item
-         height="16"
+         height="19"
          label="Revert"
          layout="topleft"
          left_delta="0"
@@ -652,27 +602,16 @@
          top_delta="15"
          width="114" />
     </radio_group>
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="20"
-     label="Apply"
-     label_selected="Apply"
-     layout="topleft"
-     left_delta="112"
-     name="button apply to selection"
-     tool_tip="Modify Selected Land"
-     top_delta="-2"
-     width="78" />
+    
     <text
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="2"
+     left="125"
      name="Bulldozer:"
-     top_pad="4"
+     top="57"
      width="100">
         Bulldozer:
     </text>
@@ -682,22 +621,22 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="132"
      name="Dozer Size:"
-     top="94"
-     width="100">
+     left="135"
+     top_pad="5"
+     width="50">
         Size
     </text>
     <slider_bar
      follows="left|top"
-     height="16"
+     height="19"
      initial_value="2.0"
      layout="topleft"
-     left_delta="46"
      max_val="11"
      min_val="1"
+     left_pad="0"
      name="slider brush size"
-     top_delta="0"
+     top_delta="-3"
      width="80" />
     <text
      type="string"
@@ -705,71 +644,79 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="132"
      name="Strength:"
-     top="116"
-     width="100">
+     left="135"
+     top_pad="5"
+     width="50">
         Strength
     </text>
     <slider_bar
      follows="left|top"
-     height="16"
+     height="19"
+     left_pad="0"
      initial_value="0.00"
      layout="topleft"
-     left_delta="46"
      max_val="2"
      min_val="-1"
      name="slider force"
-     top_delta="0"
+     top_delta="-3"
      width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="19"
+     label="Apply"
+     label_selected="Apply"
+     top_pad="5"
+     layout="topleft"
+     left="135"
+     name="button apply to selection"
+     tool_tip="Modify Selected Land"
+     width="78" />
     <text
      type="string"
+     text_color="LabelSelectedDisabledColor"
      length="1"
+     top_pad="7"
+     height="12"
      follows="left|top"
      halign="right"
-     height="16"
      layout="topleft"
-     left="118"
+     left="115"
      name="obj_count"
-     top="135"
      width="143">
-        Selected objects: [COUNT]
+        Objects: [COUNT]
     </text>
     <text
      type="string"
+     text_color="LabelSelectedDisabledColor"
      length="1"
      follows="left|top"
      halign="right"
-     height="16"
      layout="topleft"
-     left_delta="0"
      name="prim_count"
-     top_delta="12"
      width="143">
-        primitives: [COUNT]
+        Prims: [COUNT]
     </text>
     <tab_container
      follows="left|top"
-     height="384"
+     height="400"
      layout="topleft"
      left="0"
      name="Object Info Tabs"
-     tab_max_width="52"
+     tab_max_width="55"
      tab_min_width="40"
      tab_position="top"
-     top="166"
-     width="272">
+     top="180"
+     width="280">
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
-         height="367"
          label="General"
          layout="topleft"
-         left="1"
          mouse_opaque="false"
          name="General"
-         top="16"
-         width="270">
+         top="16">
             <panel.string
              name="text deed continued">
                 Deed...
@@ -780,35 +727,35 @@
             </panel.string>
             <panel.string
              name="text modify info 1">
-                You can modify this object.
+                You can modify this object
             </panel.string>
             <panel.string
              name="text modify info 2">
-                You can modify these objects.
+                You can modify these objects
             </panel.string>
             <panel.string
              name="text modify info 3">
-                You cannot modify this object.
+                You can't modify this object
             </panel.string>
             <panel.string
              name="text modify info 4">
-                You cannot modify these objects.
+                You can't modify these objects
             </panel.string>
             <panel.string
              name="text modify warning">
-                Must select entire object to set permissions.
+                This object has linked parts
             </panel.string>
             <panel.string
              name="Cost Default">
-                Price:           L$
+                Price: L$
             </panel.string>
             <panel.string
              name="Cost Total">
-                Total Price:  L$
+                Total Price: L$
             </panel.string>
             <panel.string
              name="Cost Per Unit">
-                Price Per:     L$
+                Price Per: L$
             </panel.string>
             <panel.string
              name="Cost Mixed">
@@ -826,17 +773,15 @@
              layout="topleft"
              left="10"
              name="Name:"
-             top="10"
-             width="78">
+             top_pad="8"
+             width="90">
                 Name:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
              follows="left|top|right"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
+             left_pad="0"
              max_length="63"
              name="Object Name"
              select_on_focus="true"
@@ -850,319 +795,163 @@
              layout="topleft"
              left="10"
              name="Description:"
-             top="30"
-             width="78">
+             top_pad="3"
+             width="90">
                 Description:
             </text>
             <line_editor
-             border_style="line"
-             border_thickness="1"
              follows="left|top|right"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
+             left_pad="0"
              max_length="127"
              name="Object Description"
              select_on_focus="true"
              top_delta="0"
              width="172" />
+
             <text
              type="string"
+             left="10"
              length="1"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left="10"
              name="Creator:"
-             top="50"
-             width="78">
+             width="90">
                 Creator:
             </text>
+<!-- TODO: add person inspector to creator name -->
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             left_pad="0"
+             height="19"
              layout="topleft"
-             left_delta="78"
              name="Creator Name"
-             top_delta="0"
-             width="88">
+             width="150">
                 Thrax Linden
             </text>
-            <button
+<!--TODO: Kill this-->
+<!--            <button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Profile..."
              label_selected="Profile..."
              layout="topleft"
              left_pad="6"
              name="button creator profile"
-             top_delta="-4"
-             width="78" />
+             tool_tip="View creator profile"
+             width="78" />-->
             <text
              type="string"
              length="1"
+             left="10"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left="10"
              name="Owner:"
-             top="70"
-             width="78">
+             width="90">
                 Owner:
             </text>
+<!--TODO: add person inspector to creator name-->
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="19"
              layout="topleft"
-             left_delta="78"
              name="Owner Name"
-             top_delta="0"
-             width="88">
+             left_pad="0"
+             width="150">
                 Thrax Linden
             </text>
-            <button
+<!--TODO: Kill this-->
+<!--<button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Profile..."
              label_selected="Profile..."
              layout="topleft"
              left_pad="6"
              name="button owner profile"
-             top_delta="-4"
-             width="78" />
-            <text
+             tool_tip="View owner profile"
+             width="78" />-->
+           <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
              layout="topleft"
              left="10"
+             height="19"
              name="Group:"
-             top="90"
-             width="78">
+             width="90">
                 Group:
             </text>
             <name_box
-             follows="left|top"
-             height="16"
-             initial_value="(retrieving)"
-             layout="topleft"
-             left_delta="78"
-             name="Group Name Proxy"
-             top_delta="0"
-             width="88" />
-            <button
-             follows="top|right"
-             font="SansSerifSmall"
-             height="20"
-             label="Set..."
-             label_selected="Set..."
-             layout="topleft"
-             left_pad="6"
-             name="button set group"
-             top_delta="-4"
-             width="78" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="Permissions:"
-             top="110"
-             width="85">
-                Permissions:
-            </text>
-            <text
-             type="string"
-             length="1"
              follows="left|top|right"
-             height="16"
+             height="19"
+             initial_value="Loading..."
              layout="topleft"
-             left_delta="0"
-             name="perm_modify"
-             top_pad="4"
-             width="250">
-                You can modify this object.
-            </text>
-            <check_box
-             height="16"
-             label="Share with group"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox share with group"
-             tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
-             top_pad="4"
-             width="166" />
+             left_pad="0"
+             name="Group Name Proxy"
+             width="170" />
             <button
              follows="top|right"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Deed..."
              label_selected="Deed..."
              layout="topleft"
-             left_delta="172"
              name="button deed"
-             tool_tip="Group shared objects can be deeded by a group officer."
-             top="166"
-             width="78" />
-            <check_box
-             height="16"
-             label="Allow anyone to move"
-             layout="topleft"
-             left="10"
-             name="checkbox allow everyone move"
-             top="190"
-             width="142" />
-            <check_box
-             height="16"
-             label="Allow anyone to copy"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox allow everyone copy"
-             top_pad="4"
-             width="141" />
-            <check_box
-             height="16"
-             label="Show in search"
+             top_pad="0"
+             left="102"
+             tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer."
+             width="80" />
+            <button
+            follows="left|top"
+             font="SansSerifSmall"
+             height="19"
+             label="Set..."
+             label_selected="Set..."
              layout="topleft"
-             left_delta="0"
-             name="search_check"
-             tool_tip="Let people see this object in search results"
-             top_pad="4"
-             width="78" />
+             left_pad="7"
+             name="button set group"
+             tool_tip="Choose a group to share this object's permissions"
+             width="80" />
             <check_box
-             height="16"
-             label="For Sale"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox for sale"
-             top_pad="4"
-             width="78" />
-            <text
-             type="string"
-             length="1"
+             height="19"
              follows="left|top"
-             height="16"
-             layout="topleft"
-             left_pad="12"
-             name="Cost"
-             top_delta="0"
-             width="78">
-                Price:  L$
-            </text>
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="2"
-             max_length="25"
-             name="Edit Cost"
-             top_delta="0"
-             width="75" />
-            <radio_group
-             draw_border="false"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left="42"
-             name="sale type"
-             top="270"
-             width="218">
-                <radio_item
-                 height="16"
-                 label="Original"
-                 layout="topleft"
-                 left="0"
-                 name="Original"
-                 top="0"
-                 width="70" />
-                <radio_item
-                 height="16"
-                 label="Copy"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Copy"
-                 top_delta="0"
-                 width="70" />
-                <radio_item
-                 height="16"
-                 label="Contents"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Contents"
-                 top_delta="0"
-                 width="76" />
-            </radio_group>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="Next owner can:"
-             top="288"
-             width="250">
-                Next owner can:
-            </text>
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Modify"
-             layout="topleft"
-             left_delta="0"
-             name="checkbox next owner can modify"
-             top_pad="6"
-             width="250" />
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Copy"
-             layout="topleft"
-             left_delta="60"
-             name="checkbox next owner can copy"
-             top_delta="0"
-             width="190" />
-            <check_box
-             follows="left|top|right"
-             height="16"
-             label="Resell/Give away"
+             label="Share"
              layout="topleft"
-             left_delta="60"
-             name="checkbox next owner can transfer"
-             top_delta="0"
-             width="130" />
+             name="checkbox share with group"
+             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+             left="100"
+             width="93" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="10"
+             height="19"
              layout="topleft"
+             top_pad="7"
              left="10"
              name="label click action"
-             top="322"
-             width="150">
-                When Left-Clicked:
+             width="90">
+                Click to:
             </text>
             <combo_box
-             height="18"
+             follows="left|top"
+             height="22"
              layout="topleft"
-             left_delta="0"
              name="clickaction"
-             top_pad="7"
-             width="150">
+             width="170"
+             left_pad="0">
                 <combo_box.item
-                 label="Touch/grab (default)"
+                 label="Touch  (default)"
                  value="Touch/grab (default)" />
                 <combo_box.item
                  label="Sit on object"
@@ -1176,88 +965,275 @@
                 <combo_box.item
                  label="Open"
                  value="Open" />
-                <combo_box.item
+<!--TODO: Kill this-->
+<!--                <combo_box.item
                  label="Play parcel media"
                  value="Play" />
                 <combo_box.item
                  label="Open parcel media"
-                 value="Open Media" />
+                 value="Open Media" />-->
             </combo_box>
+            <check_box
+             height="20"
+             label="For Sale:"
+             layout="topleft"
+             name="checkbox for sale"
+             left="10"
+             width="90" />
+<!-- NEW SALE TYPE COMBO BOX -->
+      <combo_box
+            left_pad="0"
+            layout="topleft"
+            follows="left|top"
+            allow_text_entry="false"
+            height="22"
+            width="170"
+            max_chars="20"
+            mouse_opaque="true"
+            name="sale type">
+         <combo_item
+            name="Copy"
+            value="Copy">
+            Copy
+         </combo_item>
+         <combo_item
+            name="Contents"
+            value="Contents">
+                  Contents
+         </combo_item>
+         <combo_item
+            name="Original"
+            value="Original">
+                  Original
+         </combo_item>
+      </combo_box>
+<!-- NEW PRICE SPINNER -->
+      <spinner
+        follows="left|top"
+        decimal_digits="0"
+        increment="1"
+        control_name="Edit Cost"
+        name="Edit Cost"
+        label="Price: L$"
+        label_width="60"
+        width="170"
+        min_val="1"
+        height="19"
+        max_val="999999999" />
+        <panel
+         border="false"
+         follows="left|top|right"
+         layout="topleft"
+         mouse_opaque="false"
+         background_visible="true"
+         bg_alpha_color="FloaterUnfocusBorderColor"
+         name="perms_build"
+         left="0"
+         height="140"
+         width="280">
             <text
              type="string"
              length="1"
+             left="10"
+             top_pad="6"
+             height="19"
+             follows="left|top|right"
+             layout="topleft"
+             name="perm_modify"
+             width="180">
+                You can modify this object
+            </text>
+            <text
+             type="string"
+             text_color="LabelSelectedDisabledColor"
+             length="1"
+             top_pad="0"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left="88"
+             left="17"
              name="B:"
-             top="105"
-             width="174">
+             width="30">
                 B:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="O:"
-             top_delta="0"
-             width="124">
-                O;
+             width="30">
+                O:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="G:"
-             top_delta="0"
-             width="74">
+             width="30">
                 G:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
+             left_pad="0"
              layout="topleft"
-             left="88"
              name="E:"
-             top="117"
-             width="174">
+             width="30">
                 E:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="N:"
-             top_delta="0"
-             width="124">
+             width="30">
                 N:
             </text>
             <text
              type="string"
+             text_color="LabelSelectedDisabledColor"
              length="1"
              follows="left|top"
-             height="10"
              layout="topleft"
-             left_delta="50"
+             left_pad="0"
              name="F:"
-             top_delta="0"
-             width="74">
+             width="30">
                 F:
             </text>
+             <check_box
+             left="15"
+             height="19"
+             label="Show in search"
+             layout="topleft"
+             name="search_check"
+             tool_tip="Let people see this object in search results"
+              />
+            <text
+               type="string"
+               follows="left|top"
+               name="Next owner can:"
+               width="250"
+               top_pad="7"
+               left="10">
+                 Anyone:
+            </text>
+            <check_box
+             height="19"
+             label="Move"
+             layout="topleft"
+             name="checkbox allow everyone move"
+             left="15"
+             width="85" />
+            <check_box
+             height="19"
+             label="Copy"
+             layout="topleft"
+             left_pad="0"
+             name="checkbox allow everyone copy"
+             width="260" />
+            <text
+               type="string"
+               follows="left|top"
+               height="19"
+               name="Next owner can:"
+               width="270"
+               left="10">
+                  Next owner:
+            </text>
+            <check_box
+             follows="left|top|right"
+             label="Modify"
+             layout="topleft"
+             left="15"
+             name="checkbox next owner can modify"
+             width="85" />
+            <check_box
+             follows="left|top|right"
+             height="19"
+             label="Copy"
+             layout="topleft"
+             left_pad="0"
+             name="checkbox next owner can copy"
+             width="90" />
+            <check_box
+             follows="left|top|right"
+             height="19"
+             label="Transfer"
+             layout="topleft"
+             name="checkbox next owner can transfer"
+             left_pad="0"
+             top_delta="0"
+             tool_tip="Next owner can give away or resell this object"
+             width="90" />
+        </panel>
+<!--TODO: KILL THIS-->
+<!--<text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="19"
+             layout="topleft"
+             left_pad="12"
+             name="Cost"
+             top_delta="0"
+             width="78">
+                Price:  L$
+            </text>
+            <line_editor
+             follows="left|top|right"
+             height="19"
+             layout="topleft"
+             left_pad="0"
+             max_length="25"
+             name="Edit Cost"
+             top_delta="0"
+             width="75" />-->
+<!--TODO: KILL THIS-->
+<!--<radio_group
+             follows="left|top|right"
+             height="19"
+             left="15"
+             layout="topleft"
+             name="sale type"
+             width="218">
+                <radio_item
+                 height="19"
+                 label="Original"
+                 layout="topleft"
+                 left="0"
+                 name="Original"
+                 top="0"
+                 width="70" />
+                <radio_item
+                 height="19"
+                 label="Copy"
+                 layout="topleft"
+                 left_delta="70"
+                 name="Copy"
+                 top_delta="0"
+                 width="70" />
+                <radio_item
+                 height="19"
+                 label="Contents"
+                 layout="topleft"
+                 left_delta="70"
+                 name="Contents"
+                 top_delta="0"
+                 width="76" />
+        </radio_group>-->
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Object"
@@ -1266,7 +1242,7 @@
          mouse_opaque="false"
          name="Object"
          top_delta="0"
-         width="270">
+         width="280">
             <text
              type="string"
              length="1"
@@ -1292,7 +1268,7 @@
                 Edit object parameters:
             </text>
             <check_box
-             height="16"
+             height="19"
              label="Locked"
              layout="topleft"
              left_delta="-2"
@@ -1301,7 +1277,7 @@
              top_pad="10"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Physical"
              layout="topleft"
              left_delta="0"
@@ -1310,7 +1286,7 @@
              top_pad="2"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Temporary"
              layout="topleft"
              left_delta="0"
@@ -1319,7 +1295,7 @@
              top_pad="2"
              width="123" />
             <check_box
-             height="16"
+             height="19"
              label="Phantom"
              layout="topleft"
              left_delta="0"
@@ -1327,6 +1303,48 @@
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="2"
              width="123" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             name="label material"
+             top_pad="9"
+             width="121">
+                Material
+            </text>
+            <combo_box
+             height="19"
+             layout="topleft"
+             left_delta="0"
+             name="material"
+             top_pad="4"
+             width="95">
+                <combo_box.item
+                 label="Stone"
+                 value="Stone" />
+                <combo_box.item
+                 label="Metal"
+                 value="Metal" />
+                <combo_box.item
+                 label="Glass"
+                 value="Glass" />
+                <combo_box.item
+                 label="Wood"
+                 value="Wood" />
+                <combo_box.item
+                 label="Flesh"
+                 value="Flesh" />
+                <combo_box.item
+                 label="Plastic"
+                 value="Plastic" />
+                <combo_box.item
+                 label="Rubber"
+                 value="Rubber" />
+            </combo_box>
             <text
              type="string"
              length="1"
@@ -1335,13 +1353,13 @@
              layout="topleft"
              left_delta="2"
              name="label position"
-             top_pad="4"
+             top_pad="8"
              width="121">
                 Position (meters)
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="X"
@@ -1352,11 +1370,11 @@
              min_val="-256"
              name="Pos X"
              text_enabled_color="0.43 0.06 0.06 1"
-             top_pad="4"
+             top_pad="5"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Y"
@@ -1367,11 +1385,11 @@
              min_val="-256"
              name="Pos Y"
              text_enabled_color="0 0.39 0.15 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Z"
@@ -1381,7 +1399,7 @@
              max_val="4096"
              name="Pos Z"
              text_enabled_color="0 0.26 0.51 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <text
              type="string"
@@ -1397,7 +1415,7 @@
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="X"
@@ -1408,11 +1426,11 @@
              min_val="0.01"
              name="Scale X"
              text_enabled_color="1 1 1 1"
-             top_pad="4"
+             top_pad="5"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Y"
@@ -1423,11 +1441,11 @@
              min_val="0.01"
              name="Scale Y"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Z"
@@ -1438,7 +1456,7 @@
              min_val="0.01"
              name="Scale Z"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <text
              type="string"
@@ -1455,7 +1473,7 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="X"
@@ -1466,12 +1484,12 @@
              min_val="-9999"
              name="Rot X"
              text_enabled_color="1 1 1 1"
-             top_pad="6"
+             top_pad="5"
              width="87" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="Y"
@@ -1482,12 +1500,12 @@
              min_val="-9999"
              name="Rot Y"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              label="Z"
@@ -1498,68 +1516,28 @@
              min_val="-9999"
              name="Rot Z"
              text_enabled_color="1 1 1 1"
-             top_pad="2"
+             top_pad="3"
              width="87" />
+            
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
-             name="label material"
-             top_pad="6"
-             width="121">
-                Material
-            </text>
-            <combo_box
-             height="18"
-             layout="topleft"
-             left_delta="0"
-             name="material"
-             top_pad="4"
-             width="87">
-                <combo_box.item
-                 label="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 value="Rubber" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="121"
+             left="125"
              name="label basetype"
              top="26"
-             width="141">
+             width="150">
                 Building Block Type
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="comboBaseType"
-             top_pad="6"
-             width="141">
+             top_pad="4"
+             width="150">
                 <combo_box.item
                  label="Box"
                  value="Box" />
@@ -1593,13 +1571,13 @@
              layout="topleft"
              left_delta="0"
              name="text cut"
-             top_pad="2"
-             width="141">
+             top_pad="6"
+             width="150">
                 Path Cut Begin and End
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="0"
              label="B"
@@ -1608,17 +1586,17 @@
              left_delta="0"
              max_val="0.98"
              name="cut begin"
-             top_pad="6"
+             top_pad="4"
              width="68" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="1"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="0.02"
              name="cut end"
              top_delta="0"
@@ -1629,9 +1607,9 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text hollow"
-             top="98"
+             top_pad="6"
              width="68">
                 Hollow
             </text>
@@ -1650,23 +1628,23 @@
             <spinner
              decimal_digits="1"
              follows="left|top"
-             height="16"
+             height="19"
              increment="5"
              initial_value="0"
              layout="topleft"
-             left="121"
+             left="125"
              max_val="95"
              name="Scale 1"
-             top="112"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="0.95"
              min_val="-0.95"
              name="Skew"
@@ -1678,19 +1656,19 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="Hollow Shape"
-             top="133"
-             width="141">
+             top_pad="6"
+             width="150">
                 Hollow Shape
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="hole"
-             top_pad="6"
-             width="141">
+             top_pad="4"
+             width="150">
                 <combo_box.item
                  label="Default"
                  value="Default" />
@@ -1712,14 +1690,14 @@
              layout="topleft"
              left_delta="0"
              name="text twist"
-             top_pad="2"
-             width="141">
+             top_pad="4"
+             width="150">
                 Twist Begin and End
             </text>
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="9"
              initial_value="0"
              label="B"
@@ -1729,18 +1707,18 @@
              max_val="180"
              min_val="-180"
              name="Twist Begin"
-             top_pad="6"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="9"
              initial_value="0"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="180"
              min_val="-180"
              name="Twist End"
@@ -1752,10 +1730,10 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="scale_taper"
-             top="205"
-             width="141">
+             top_pad="6"
+             width="150">
                 Taper
             </text>
             <text
@@ -1767,13 +1745,13 @@
              left_delta="0"
              name="scale_hole"
              top_delta="0"
-             width="141">
+             width="150">
                 Hole Size
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1787,13 +1765,13 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="-1"
              name="Taper Scale Y"
              top_delta="0"
@@ -1804,16 +1782,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text topshear"
-             top="239"
+             top_pad="6"
              width="141">
                 Top Shear
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1828,13 +1806,13 @@
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="0.5"
              min_val="-0.5"
              name="Shear Y"
@@ -1846,10 +1824,10 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="advanced_cut"
-             top="273"
-             width="141">
+             top_pad="6"
+             width="150">
                 Profile Cut Begin and End
             </text>
             <text
@@ -1861,7 +1839,7 @@
              left_delta="0"
              name="advanced_dimple"
              top_delta="0"
-             width="141">
+             width="150">
                 Dimple Begin and End
             </text>
             <text
@@ -1873,12 +1851,12 @@
              left_delta="0"
              name="advanced_slice"
              top_delta="0"
-             width="141">
+             width="150">
                 Slice Begin and End
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="0"
              label="B"
@@ -1887,17 +1865,17 @@
              left_delta="0"
              max_val="0.95"
              name="Path Limit Begin"
-             top_pad="3"
+             top_pad="4"
              width="68" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.025"
              initial_value="1"
              label="E"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="0.05"
              name="Path Limit End"
              top_delta="0"
@@ -1908,16 +1886,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text taper2"
-             top="306"
-             width="141">
+             top_pad="6"
+             width="150">
                 Taper
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="X"
@@ -1926,18 +1904,18 @@
              left_delta="0"
              min_val="-1"
              name="Taper X"
-             top_pad="3"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              label="Y"
              label_width="10"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              min_val="-1"
              name="Taper Y"
              top_delta="0"
@@ -1948,9 +1926,9 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="121"
+             left="125"
              name="text radius delta"
-             top="337"
+             top_pad="6"
              width="78">
                 Radius
             </text>
@@ -1960,7 +1938,7 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="73"
+             left_delta="78"
              name="text revolutions"
              top_delta="0"
              width="68">
@@ -1968,22 +1946,22 @@
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.05"
              initial_value="0"
              layout="topleft"
-             left="121"
+             left="125"
              min_val="-1"
              name="Radius Offset"
-             top="350"
+             top_pad="4"
              width="68" />
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="1"
              layout="topleft"
-             left_pad="5"
+             left_pad="10"
              max_val="4"
              min_val="1"
              name="Revolutions"
@@ -1996,14 +1974,14 @@
              height="141"
              label="Sculpt Texture"
              layout="topleft"
-             left="121"
+             left="125"
              name="sculpt texture control"
              tool_tip="Click to choose a picture"
              top="70"
              visible="false"
-             width="141" />
+             width="145" />
             <check_box
-             height="16"
+             height="19"
              label="Mirror"
              layout="topleft"
              left_delta="0"
@@ -2011,9 +1989,9 @@
              tool_tip="Flips sculpted prim along the X axis."
              top_pad="8"
              visible="false"
-             width="121" />
+             width="130" />
             <check_box
-             height="16"
+             height="19"
              label="Inside-out"
              layout="topleft"
              left_delta="0"
@@ -2032,17 +2010,17 @@
              name="label sculpt type"
              top_pad="10"
              visible="false"
-             width="121">
+             width="130">
                 Stitching type
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="sculpt type control"
-             top_pad="6"
+             top_pad="4"
              visible="false"
-             width="141">
+             width="150">
                 <combo_box.item
                  label="none)"
                  value="None" />
@@ -2060,8 +2038,9 @@
                  value="Cylinder" />
             </combo_box>
         </panel>
+
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Features"
@@ -2070,7 +2049,7 @@
          mouse_opaque="false"
          name="Features"
          top_delta="0"
-         width="270">
+         width="280">
             <text
              type="string"
              length="1"
@@ -2096,7 +2075,7 @@
                 Edit object features:
             </text>
             <check_box
-             height="16"
+             height="19"
              label="Flexible Path"
              layout="topleft"
              left_delta="0"
@@ -2106,7 +2085,7 @@
              width="121" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="2"
              label="Softness"
@@ -2115,11 +2094,11 @@
              left_delta="0"
              max_val="3"
              name="FlexNumSections"
-             top_pad="4"
+             top_pad="10"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="0.3"
              label="Gravity"
@@ -2133,7 +2112,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="2"
              label="Drag"
@@ -2146,7 +2125,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="0"
              label="Wind"
@@ -2159,7 +2138,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.5"
              initial_value="1"
              label="Tension"
@@ -2172,7 +2151,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force X"
@@ -2186,7 +2165,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force Y"
@@ -2200,7 +2179,7 @@
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.01"
              initial_value="0"
              label="Force Z"
@@ -2213,7 +2192,7 @@
              top_pad="4"
              width="128" />
             <check_box
-             height="16"
+             height="19"
              label="Light"
              layout="topleft"
              left_delta="0"
@@ -2229,7 +2208,7 @@
              layout="topleft"
              left_delta="0"
              name="label color"
-             top_pad="11"
+             top_pad="15"
              width="58">
                 Color
             </text>
@@ -2243,22 +2222,22 @@
              left_delta="67"
              name="colorswatch"
              tool_tip="Click to open Color Picker"
-             top="237"
+             top_delta="-10"
              width="32" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0.5"
              label="Intensity"
              label_width="65"
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top="273"
+             top_pad="4"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="5"
              label="Radius"
              label_width="65"
@@ -2266,11 +2245,11 @@
              left_delta="0"
              max_val="20"
              name="Light Radius"
-             top_pad="4"
+             top_pad="0"
              width="128" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              increment="0.25"
              initial_value="1"
              label="Falloff"
@@ -2279,11 +2258,11 @@
              left_delta="0"
              max_val="2"
              name="Light Falloff"
-             top_pad="4"
+             top_pad="0"
              width="128" />
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Texture"
@@ -2292,7 +2271,7 @@
          mouse_opaque="false"
          name="Texture"
          top_delta="0"
-         width="270">
+         width="280">
             <panel.string
              name="string repeats per meter">
                 Repeats Per Meter
@@ -2320,7 +2299,7 @@
              height="80"
              label="Color"
              layout="topleft"
-             left_pad="26"
+             left_pad="25"
              name="colorswatch"
              tool_tip="Click to open Color Picker"
              top_delta="0"
@@ -2331,16 +2310,16 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="180"
+             left_pad="20"
              name="color trans"
-             top="1"
-             width="80">
+             top="10"
+             width="100">
                 Transparency %
             </text>
             <spinner
              decimal_digits="0"
              follows="left|top"
-             height="16"
+             height="19"
              increment="2"
              initial_value="0"
              layout="topleft"
@@ -2357,14 +2336,14 @@
              layout="topleft"
              left_delta="0"
              name="glow label"
-             top_pad="2"
+             top_pad="4"
              width="80">
                 Glow
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              layout="topleft"
              left_delta="0"
@@ -2372,7 +2351,7 @@
              top_pad="4"
              width="80" />
             <check_box
-             height="16"
+             height="19"
              label="Full Bright"
              layout="topleft"
              left_delta="0"
@@ -2387,12 +2366,12 @@
              layout="topleft"
              left="10"
              name="tex gen"
-             top="94"
+             top_pad="10"
              width="90">
                 Mapping
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox texgen"
@@ -2413,12 +2392,12 @@
              layout="topleft"
              left="100"
              name="label shininess"
-             top="94"
+             top_pad="-33"
              width="70">
                 Shininess
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox shininess"
@@ -2445,12 +2424,12 @@
              layout="topleft"
              left="180"
              name="label bumpiness"
-             top="94"
+             top_pad="-33"
              width="80">
                 Bumpiness
             </text>
             <combo_box
-             height="18"
+             height="19"
              layout="topleft"
              left_delta="0"
              name="combobox bumpiness"
@@ -2519,13 +2498,13 @@
              layout="topleft"
              left="10"
              name="tex scale"
-             top="148"
+             top_pad="15"
              width="160">
                 Repeats per Face
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Horizontal (U)"
              label_width="90"
@@ -2533,10 +2512,10 @@
              left="20"
              max_val="100"
              name="TexScaleU"
-             top="162"
+             top_pad="10"
              width="160" />
             <check_box
-             height="16"
+             height="19"
              label="Flip"
              layout="topleft"
              left_pad="10"
@@ -2545,7 +2524,7 @@
              width="70" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Vertical (V)"
              label_width="90"
@@ -2553,10 +2532,10 @@
              left="20"
              max_val="100"
              name="TexScaleV"
-             top="180"
+             top_pad="0"
              width="160" />
             <check_box
-             height="16"
+             height="19"
              label="Flip"
              layout="topleft"
              left_pad="10"
@@ -2571,14 +2550,14 @@
              layout="topleft"
              left="10"
              name="tex rotate"
-             top="218"
+             top_pad="20"
              width="102">
                 Rotation (degrees)
             </text>
             <spinner
              decimal_digits="2"
              follows="left|top"
-             height="16"
+             height="19"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -2596,14 +2575,14 @@
              layout="topleft"
              left="10"
              name="rpt"
-             top="240"
+             top_pad="0"
              width="160">
                 Repeats Per Meter
             </text>
             <spinner
              decimal_digits="1"
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="1"
              layout="topleft"
              left_delta="102"
@@ -2615,7 +2594,7 @@
             <button
              follows="left|top"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Apply"
              label_selected="Apply"
              layout="topleft"
@@ -2631,13 +2610,13 @@
              layout="topleft"
              left="10"
              name="tex offset"
-             top="278"
+             top_pad="20"
              width="160">
                 Offset
             </text>
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Horizontal (U)"
              label_width="90"
@@ -2645,11 +2624,11 @@
              left="20"
              min_val="-1"
              name="TexOffsetU"
-             top="292"
+             top_pad="10"
              width="160" />
             <spinner
              follows="left|top"
-             height="16"
+             height="19"
              initial_value="0"
              label="Vertical (V)"
              label_width="90"
@@ -2659,11 +2638,12 @@
              name="TexOffsetV"
              top_pad="2"
              width="160" />
-            <text
+<!--TODO: KILL THIS-->
+ <!--           <text
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="19"
              layout="topleft"
              left="10"
              name="textbox autofix"
@@ -2675,17 +2655,17 @@
             <button
              follows="left|top"
              font="SansSerifSmall"
-             height="20"
+             height="19"
              label="Align"
              label_selected="Align"
              layout="topleft"
              left="112"
              name="button align"
              top="340"
-             width="68" />
+             width="68" />-->
         </panel>
         <panel
-         border="true"
+         border="false"
          follows="left|top|right|bottom"
          height="367"
          label="Content"
@@ -2694,10 +2674,10 @@
          mouse_opaque="false"
          name="Contents"
          top_delta="0"
-         width="270">
+         width="280">
             <button
              follows="left|top"
-             height="20"
+             height="19"
              label="New Script"
              label_selected="New Script..."
              layout="topleft"
@@ -2707,7 +2687,7 @@
              width="100" />
             <button
              follows="left|top"
-             height="20"
+             height="19"
              label="Permissions..."
              layout="topleft"
              left_pad="10"
@@ -2716,29 +2696,30 @@
              width="100" />
             <panel_inventory
              follows="left|top"
-             height="325"
+             height="300"
              layout="topleft"
              left="10"
              name="contents_inventory"
              top="35"
-             width="252" />
+             width="260" />
         </panel>
     </tab_container>
     <panel
-     follows="left|top"
+      follows="left|top"
      height="384"
      layout="topleft"
      left_delta="0"
      name="land info panel"
      top_delta="0"
-     width="272">
+     width="280">
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_info"
          top="24"
          width="150">
@@ -2748,9 +2729,9 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="48"
+         left="30"
          name="label_area_price"
          top="48"
          width="150">
@@ -2760,7 +2741,7 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
          left_delta="0"
          name="label_area"
@@ -2770,7 +2751,7 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="About Land..."
          label_selected="About Land..."
          layout="topleft"
@@ -2780,31 +2761,32 @@
          width="112" />
         <check_box
          control_name="ShowParcelOwners"
-         height="16"
+         height="19"
          label="Show owners"
          layout="topleft"
          left_delta="0"
          name="checkbox show owners"
          tool_tip="Colour parcels according to their ownership"
          top_pad="8"
-         width="100" />
+         width="140" />
         <button
          follows="left|top"
-         height="18"
+         height="19"
          label="?"
          label_selected="?"
          layout="topleft"
-         left_delta="94"
+         left_pad="5"
          name="button show owners help"
          top_delta="-2"
          width="18" />
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_modify"
          top="152"
          width="150">
@@ -2812,17 +2794,17 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Subdivide..."
          label_selected="Subdivide..."
          layout="topleft"
-         left="48"
+         left="30"
          name="button subdivide land"
          top="172"
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Join..."
          label_selected="Join..."
          layout="topleft"
@@ -2833,10 +2815,11 @@
         <text
          type="string"
          length="1"
+         font="SansSerifBig"
          follows="left|top"
-         height="16"
+         height="19"
          layout="topleft"
-         left="40"
+         left="20"
          name="label_parcel_trans"
          top="256"
          width="150">
@@ -2844,17 +2827,17 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Buy Land..."
          label_selected="Buy Land..."
          layout="topleft"
-         left="48"
+         left="30"
          name="button buy land"
          top="276"
          width="112" />
         <button
          follows="left|top"
-         height="20"
+         height="19"
          label="Abandon Land..."
          label_selected="Abandon Land..."
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
index 82a9750cda..cf59d44d01 100644
--- a/indra/newview/skins/default/xui/en/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml
@@ -4,7 +4,7 @@
  height="87"
  layout="topleft"
  name="url_entry"
- width="500">
+ width="280">
     <text
      type="string"
      length="1"
@@ -12,7 +12,7 @@
      follows="top|left"
      height="15"
      layout="topleft"
-     left="20"
+     left="10"
      name="media_label"
      top="20">
         Media URL:
@@ -26,44 +26,48 @@
      max_chars="255"
      name="media_entry"
      top_delta="-4"
-     width="370" />
+     width="190" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="OK"
      layout="topleft"
-     left="20"
+     left="10"
      name="ok_btn"
      top="50"
      width="64" />
     <button
      follows="top|left"
      height="20"
+     font="SansSerifSmall"
      label="Cancel"
      layout="topleft"
-     left_pad="28"
+     left_pad="5"
      name="cancel_btn"
      top_delta="0"
      width="64" />
     <button
      follows="top|right"
      height="20"
+     font="SansSerifSmall"
      label="Clear"
      layout="topleft"
-     left_pad="220"
+     left_pad="65"
      name="clear_btn"
      top_delta="0"
      width="64" />
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      bottom_delta="-2"
      follows="bottom|left"
      height="15"
      layout="topleft"
-     left="220"
+     left="152"
      name="loading_label"
-     visible="false">
+     visible="true">
         Loading...
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 483291044d..ced8ba83f7 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -19,13 +19,25 @@
   </font>
 
   <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>"MtBkLfRg.ttf"</file>
+    <file>Helvetica.dfont</file>
+  <os name="Windows">
+      <file>arial.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+      </os>
   </font>
 
   <font name="SansSerifBold" 
 	comment="Name of bold sans-serif font" 
 	font_style="Bold">
-    <file>MtBdLfRg.ttf</file>
+    <file>Helvetica.dfont</file>
+    <os name="Windows">
+      <file>arialbd.ttf</file>
+      </os>
+    <os name="Mac">
+      <file>Helvetica.dfont</file>
+      </os>
   </font>
 
   <font name="Monospace"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 926b51d4c1..1d1a1c063e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -228,7 +228,7 @@
              parameter="active speakers" />
         </menu_item_check>
         <menu_item_check
-         label="Mute List"
+         label="Block List"
          layout="topleft"
          name="Mute List">
             <menu_item_check.on_check
@@ -2832,6 +2832,13 @@
          name="XUI"
          tear_off="true">
             <menu_item_call
+               label="Reload Color Settings"
+               layout="topleft"
+               name="Reload Color Settings">
+              <menu_item_call.on_click
+               function="Advanced.ReloadColorSettings" />
+            </menu_item_call>
+            <menu_item_call
              label="Show Font Test"
              layout="topleft"
              name="Show Font Test">
@@ -3092,7 +3099,8 @@
                  function="Advanced.ToggleInfoDisplay"
                  parameter="agent target" />
             </menu_item_check>
-         <!--   <menu_item_check
+<!-- Appears not to exist anymore
+            <menu_item_check
              label="Debug Rotation"
              layout="topleft"
              name="Debug Rotation">
@@ -3103,6 +3111,7 @@
                  function="ToggleControl"
                  parameter="DebugAvatarRotation" />
             </menu_item_check> -->
+-->
             <menu_item_call
              label="Dump Attachments"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 47b21dc64d..0a63da1463 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2836,7 +2836,7 @@ Do you REALLY want to kick all users off the grid?
    icon="alertmodal.tga"
    name="MuteLinden"
    type="alertmodal">
-Sorry, you cannot mute a Linden.
+Sorry, you cannot block a Linden.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -2851,10 +2851,10 @@ You cannot start an auction on a parcel which is already set for sale.  Disable
 
   <notification
    icon="alertmodal.tga"
-   label="Mute object by name failed"
+   label="Block object by name failed"
    name="MuteByNameFailed"
    type="alertmodal">
-You already have muted this name.
+You already have blocked this name.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -5708,7 +5708,7 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5729,7 +5729,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5750,7 +5750,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -5974,7 +5974,7 @@ Is this OK?
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6181,7 +6181,7 @@ You may only select up to [MAX_SELECT] items from this list.
    name="VoiceInviteP2P"
    type="notify">
 [NAME] is inviting you to a Voice Chat call.
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6197,7 +6197,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6205,21 +6205,21 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    icon="notify.tga"
    name="AutoUnmuteByIM"
    type="notify">
-[FIRST] [LAST] was sent an instant message and has been automatically unmuted.
+[FIRST] [LAST] was sent an instant message and has been automatically unblocked.
   </notification>
 
   <notification
    icon="notify.tga"
    name="AutoUnmuteByMoney"
    type="notify">
-[FIRST] [LAST] was given money and has been automatically unmuted.
+[FIRST] [LAST] was given money and has been automatically unblocked.
   </notification>
 
   <notification
    icon="notify.tga"
    name="AutoUnmuteByInventory"
    type="notify">
-[FIRST] [LAST] was offered inventory and has been automatically unmuted.
+[FIRST] [LAST] was offered inventory and has been automatically unblocked.
   </notification>
 
   <notification
@@ -6227,7 +6227,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="VoiceInviteGroup"
    type="notify">
 [NAME] has joined a Voice Chat call with the group [GROUP].
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
       <context key="NAME"/>
       <context key="GROUP"/>
@@ -6244,7 +6244,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6253,7 +6253,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="VoiceInviteAdHoc"
    type="notify">
 [NAME] has joined a Voice Chat call with a conference chat...
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+Click Accept to join the call or Decline to decline the invitation. Click Block to block this user.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6269,7 +6269,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
@@ -6278,7 +6278,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
    name="InviteAdHoc"
    type="notify">
 [NAME] is inviting you to a conference chat.
-Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
+Click Accept to join the chat or Decline to decline the invitation. Click Block to block this user.
     <unique>
       <context key="NAME"/>
     </unique>
@@ -6294,7 +6294,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
       <button
        index="2"
        name="Mute"
-       text="Mute"/>
+       text="Block"/>
     </form>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 1e222db7b5..a29ab971a4 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -22,7 +22,7 @@
 	  </panel>
 		<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="true" width="90" height="28" min_height="28">
-		<combo_box follows="left|right" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
+		<combo_box follows="left" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
 	  </panel>
 	  	<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28">
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 10d10f60ff..b79f5f09d9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="466"
+ height="514"
  label="General"
  layout="topleft"
  left="1"
  name="general_tab"
  top="466"
- width="418">
+ width="279">
     <panel.string
      name="help_text">
         The General tab contains general information about
@@ -41,44 +41,45 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      label="?"
      label_selected="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <line_editor
      follows="left|top"
-     font="SansSerif"
+     font="SansSerifSmall"
      halign="left"
      height="16"
      label="Type your new group name here"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-245"
      max_length="35"
      name="group_name_editor"
      top_delta="0"
-     width="300" />
+     width="200" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerifBig"
+     font="SansSerifSmall"
      height="16"
      layout="topleft"
      left_delta="0"
      name="group_name"
-     top_delta="-4"
-     width="300">
+     top_delta="0"
+     width="200">
         Type your new group name here
     </text>
     <text
      type="string"
      length="1"
+     follows="left|top"
      height="16"
      layout="topleft"
      left_delta="0"
      name="prepend_founded_by"
      top_pad="4"
-     width="100">
+     width="67">
         Founded by
     </text>
     <name_box
@@ -89,65 +90,69 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="63"
      name="founder_name"
      top_delta="0"
-     width="200" />
-    <text
+     width="133" />
+    <text_editor
      type="string"
      length="1"
-     height="16"
+     follows="left|top"
+     halign="left"
+     height="125"
+     hide_scrollbar="true"
      layout="topleft"
-     name="group_charter_label"
-     right="410"
-     top="40"
-     width="265">
+     max_length="511"
+     name="charter"
+     right="270"
+     top="42"
+     width="170"
+     word_wrap="true">
         Group Charter
-    </text>
+    </text_editor>
     <texture_picker
      follows="left|top"
-     height="144"
-     label="Group Insignia"
+     height="96"
+     label=""
      layout="topleft"
-     left_delta="-138"
+     left_delta="-95"
      name="insignia"
      tool_tip="Click to choose a picture"
      top_delta="1"
-     width="128" />
-    <text_editor
+     width="85" />
+    <text
+      follows="left|top"
      type="string"
      length="1"
-     follows="left|top"
-     halign="left"
-     height="160"
-     hide_scrollbar="true"
+     height="16"
      layout="topleft"
-     max_length="511"
-     name="charter"
-     right="410"
-     top="55"
-     width="265"
-     word_wrap="true">
+     name="group_charter_label"
+     right="270"
+     top="167"
+     width="170">
         Group Charter
-    </text_editor>
+    </text>
     <button
      follows="left|top"
      height="22"
+     font="SansSerifSmall"
      label="Join (L$0)"
      label_selected="Join (L$0)"
      layout="topleft"
      left="7"
      name="join_button"
-     top="193"
-     width="128" />
+     top="160"
+     width="85" />
     <button
      follows="left|top"
      height="22"
-     label="Detailed View"
+     font="SansSerifSmall"
+     label="Details"
      label_selected="Detailed View"
      layout="topleft"
      left_delta="0"
      name="info_button"
      top_delta="0"
-     width="128" />
+     width="85" />
     <text
+      follows="left|top"
      type="string"
      length="1"
      font="SansSerif"
@@ -155,11 +160,12 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      layout="topleft"
      left_delta="0"
      name="text_owners_and_visible_members"
-     top_pad="4"
-     width="160">
+     top_pad="15"
+     width="270">
         Owners &amp; Visible Members
     </text>
     <text
+      follows="left|top"
      type="string"
      length="1"
      height="16"
@@ -167,7 +173,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="0"
      name="text_owners_are_shown_in_bold"
      top_delta="16"
-     width="160">
+     width="270">
         (Owners are shown in bold)
     </text>
     <name_list
@@ -180,7 +186,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      left_delta="0"
      name="visible_members"
      top_pad="8"
-     width="404">
+     width="263">
         <name_list.columns
          label="Member Name"
          name="name"
@@ -195,6 +201,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          relative_width="0.25" />
     </name_list>
     <text
+      follows="left|top"
      type="string"
      length="1"
      bottom_delta="18"
@@ -208,12 +215,12 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
      bevel_style="in"
      border="true"
      follows="left|top"
-     height="96"
+     height="115"
      layout="topleft"
      left_delta="0"
      name="preferences_container"
      top_pad="8"
-     width="404">
+     width="263">
         <check_box
          height="16"
          initial_value="true"
@@ -223,7 +230,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          name="show_in_group_list"
          tool_tip="Let people see this group in search results."
          top="4"
-         width="95" />
+         width="63" />
         <check_box
          follows="right|top"
          height="16"
@@ -233,16 +240,16 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          name="open_enrollement"
          tool_tip="Sets whether this group allows new members to join   without being invited."
          top_pad="2"
-         width="95" />
+         width="63" />
         <check_box
          height="16"
          label="Enrollment fee: L$"
          layout="topleft"
-         left_delta="16"
+         left_delta="0"
          name="check_enrollment_fee"
          tool_tip="Sets whether to require an enrollment fee to join the group."
          top="40"
-         width="95" />
+         width="63" />
         <spinner
          decimal_digits="0"
          follows="left|top"
@@ -251,8 +258,9 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          increment="1"
          label_width="10"
          layout="topleft"
-         left_pad="21"
+         left="25"
          max_val="99999"
+         top="60"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
          top_delta="-2"
@@ -263,8 +271,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          left="6"
          name="group_mature_check"
          tool_tip="Sets whether your group information is considered mature."
-         top="64"
-         width="130">
+         top="90"
+         width="120">
             <combo_box.item
              label="Select Mature -"
              value="Select" />
@@ -280,7 +288,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          length="1"
          height="16"
          layout="topleft"
-         left="225"
+         left="150"
          name="active_title_label"
          top="4"
          width="95">
@@ -296,7 +304,8 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          width="95" />
         <check_box
          height="16"
-         label="Receive group notices"
+         font="SansSerifSmall"
+         label="Receive notices"
          layout="topleft"
          left_delta="0"
          name="receive_notices"
@@ -305,7 +314,7 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          width="95" />
         <check_box
          height="16"
-         label="List group in my profile"
+         label="List in my profile"
          layout="topleft"
          left_delta="0"
          name="list_groups_in_profile"
@@ -313,4 +322,4 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          top_pad="2"
          width="95" />
     </panel>
-</panel>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 35691661f1..7ff53b8491 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="470"
+ height="514"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
  name="land_money_tab"
  top="470"
- width="418">
+ width="280">
     <panel.string
      name="help_text">
         Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The Planning, Details, and Sales tabs provide information about the group&apos;s finances.
@@ -30,10 +30,11 @@
         Unable to set your land contribution.
     </panel.string>
     <button
+      follows="left|top"
      height="16"
      label="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
@@ -44,7 +45,7 @@
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-250"
      name="group_land_heading"
      top_delta="-4"
      width="150">
@@ -60,23 +61,23 @@
      left_delta="0"
      name="group_parcel_list"
      top_pad="6"
-     width="404">
+     width="275">
         <scroll_list.columns
-         label="Parcel Name"
+         label="Parcel"
          name="name"
-         width="100" />
+         width="67" />
         <scroll_list.columns
          label="Region"
          name="location"
-         width="120" />
+         width="72" />
         <scroll_list.columns
          label="Type"
          name="type"
-         width="100" />
+         width="60" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="61" />
+         width="20" />
         <scroll_list.columns
          label=""
          name="hidden"
@@ -85,13 +86,13 @@
     <button
      follows="top"
      height="20"
-     label="Show on Map"
+     label="Map"
      label_selected="Show on Map"
      layout="topleft"
-     left="312"
+     left="225"
      name="map_button"
      top="150"
-     width="100"
+     width="50"
      enabled="false" />
     <text
      type="string"
@@ -100,10 +101,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left_delta="-305"
+     left_delta="-226"
      name="total_contributed_land_label"
      top_delta="4"
-     width="120">
+     width="100">
         Total Contribution:
     </text>
     <text
@@ -125,10 +126,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="0"
      name="total_land_in_use_label"
      top="172"
-     width="120">
+     width="100">
         Total Land In Use:
     </text>
     <text
@@ -150,10 +151,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="10"
      name="land_available_label"
      top="190"
-     width="120">
+     width="90">
         Land Available:
     </text>
     <text
@@ -175,10 +176,10 @@
      halign="right"
      height="16"
      layout="topleft"
-     left="7"
+     left="0"
      name="your_contribution_label"
      top="208"
-     width="120">
+     width="100">
         Your Contribution:
     </text>
     <line_editor
@@ -200,9 +201,22 @@
      layout="topleft"
      left_pad="5"
      name="your_contribution_max_value"
-     top_delta="2"
-     width="200">
-        sq. meters ([AMOUNT] max)
+     top_delta="2">
+         sq. meters
+    </text>
+     <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="20"
+     name="your_contribution_max_value"
+     top="226"
+     top_delta="0"
+     width="180">
+        ([AMOUNT] max)
     </text>
     <icon
      height="16"
@@ -210,21 +224,24 @@
      layout="topleft"
      left="9"
      name="group_over_limit_icon"
-     top="235"
+     top="245"
      visible="false"
      width="16" />
     <text
+      follows="left|top"
      type="string"
      length="1"
-     height="16"
+     word_wrap="true"
+     font="SansSerifSmall"
+     height="50"
      layout="topleft"
      left_pad="5"
      name="group_over_limit_text"
      text_color="GroupOverTierColor"
-     top_delta="1"
-     width="400">
+     top_delta="0"
+     width="250">
         Group members must contribute more land credits to support land in use.
-    </text>
+    </text> 
     <text
      type="string"
      length="1"
@@ -234,7 +251,7 @@
      layout="topleft"
      left="12"
      name="group_money_heading"
-     top="261"
+     top_delta="40"
      width="150">
         Group L$
     </text>
@@ -245,18 +262,18 @@
      left="6"
      name="group_money_tab_container"
      tab_position="top"
-     top="286"
-     width="406">
+     top_pad="10"
+     width="270">
         <panel
          border="true"
          follows="left|top|right|bottom"
-         height="255"
+         height="180"
          label="Planning"
          layout="topleft"
          left="1"
          name="group_money_planning_tab"
          top="5"
-         width="398">
+         width="270">
             <text_editor
              type="string"
              length="1"
@@ -269,105 +286,101 @@
              max_length="4096"
              name="group_money_planning_text"
              top="5"
-             width="382">
+             width="260">
                 Computing...
             </text_editor>
         </panel>
-        <panel
+      <panel
          border="true"
-         follows="all"
-         height="250"
+         follows="left|top|right|bottom"
+         height="180"
          label="Details"
          layout="topleft"
          left_delta="0"
          name="group_money_details_tab"
-         top_delta="163"
-         width="398">
-            <text_editor
+         top_delta="0"
+         width="270">
+          <text_editor
              type="string"
              length="1"
              bg_readonly_color="0.784314 0.819608 0.8 1"
-             follows="left|top"
+             follows="all"
              font="Monospace"
-             height="125"
+             height="140"
              layout="topleft"
              left="8"
              max_length="4096"
              name="group_money_details_text"
              top="7"
-             width="382">
+             width="260">
                 Computing...
-            </text_editor>
-            <button
-             follows="left|top"
+            </text_editor> 
+          <button
              height="20"
              label="&lt; Earlier"
              label_selected="&lt; Earlier"
              layout="topleft"
-             left="24"
+             left="30"
              name="earlier_details_button"
              tool_tip="Go back in time"
-             top="136"
+             top_pad="5"
              width="80" />
             <button
-             follows="left|top"
              height="20"
              label="Later &gt;"
              label_selected="Later &gt;"
              layout="topleft"
-             left_pad="190"
+             left_pad="20"
              name="later_details_button"
              tool_tip="Go forward in time"
              top_delta="0"
-             width="80" />
+             width="80" />  
         </panel>
-        <panel
+      <panel
          border="true"
-         follows="all"
-         height="164"
+         follows="left|top|right|bottom"
+         height="180"
          label="Sales"
          layout="topleft"
          left_delta="0"
          name="group_money_sales_tab"
          top_delta="-1"
-         width="398">
+         width="270">
             <text_editor
              type="string"
              length="1"
              bg_readonly_color="0.784314 0.819608 0.8 1"
-             follows="left|top"
+             follows="all"
              font="Monospace"
-             height="125"
+             height="140"
              layout="topleft"
              left="8"
              max_length="4096"
              name="group_money_sales_text"
              top="7"
-             width="382">
+             width="260">
                 Computing...
             </text_editor>
             <button
-             follows="left|top"
              height="20"
              label="&lt; Earlier"
              label_selected="&lt; Earlier"
              layout="topleft"
-             left="24"
+             left="30"
              name="earlier_sales_button"
              tool_tip="Go back in time"
-             top="136"
+             top_pad="5"
              width="80" />
             <button
-             follows="left|top"
              height="20"
              label="Later &gt;"
              label_selected="Later &gt;"
              layout="topleft"
-             left_pad="190"
+             left_pad="20"
              name="later_sales_button"
              tool_tip="Go forward in time"
              top_delta="0"
              width="80" />
         </panel>
     </tab_container>
-</panel>
+</panel> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 345cc734e6..981fd2dde1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="466"
+ height="514"
  label="Notices"
  layout="topleft"
  left="1"
  name="notices_tab"
  top="466"
- width="418">
+ width="279">
     <panel.string
      name="help_text">
         Notices are a quick way to communicate across a 
@@ -23,40 +23,43 @@ the General tab.
         There are no past notices.
     </panel.string>
     <button
+      follows="left|top"
      height="16"
      label="?"
      label_selected="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <text
+      follows="left|top"
      type="string"
      length="1"
      font="SansSerifBig"
      height="16"
      layout="topleft"
-     left_delta="-384"
+     left_delta="-245"
      name="lbl"
      top_delta="-4"
-     width="436">
+     width="279">
         Group Notices Archive
     </text>
     <text
+      follows="left|top"
      type="string"
      length="1"
-     height="16"
+     word_wrap="true"
+     height="73"
      layout="topleft"
      left_delta="0"
      name="lbl2"
-     top_pad="4"
-     width="436">
-        Notices are kept for 14 days. Click the notice below you wish to view.
-Click the &apos;Refresh&apos; button to check if new notices have been received.
-Notice lists are limited to 200 notices per group on a daily basis.
+     top_pad="6"
+     width="270">
+        Notices are kept for 14 days. Click the notice below if you wish to view. Click the &apos;Refresh&apos; button to check if new notices have been received. Notice lists are limited to 200 notices per group on a daily basis.
     </text>
     <scroll_list
+      follows="left|top"
      column_padding="0"
      draw_heading="true"
      heading_height="14"
@@ -64,8 +67,8 @@ Notice lists are limited to 200 notices per group on a daily basis.
      layout="topleft"
      left_delta="0"
      name="notice_list"
-     top_pad="28"
-     width="404">
+     top_pad="0"
+     width="270">
         <scroll_list.columns
          label=""
          name="icon"
@@ -73,20 +76,21 @@ Notice lists are limited to 200 notices per group on a daily basis.
         <scroll_list.columns
          label="Subject"
          name="subject"
-         width="171" />
+         width="100" />
         <scroll_list.columns
          label="From"
          name="from"
-         width="125" />
+         width="83" />
         <scroll_list.columns
          label="Date"
          name="date"
-         width="85" />
+         width="50" />
         <scroll_list.columns
          name="sort"
          width="-1" />
     </scroll_list>
     <text
+      follows="left|top"
      type="string"
      length="1"
      layout="topleft"
@@ -95,33 +99,38 @@ Notice lists are limited to 200 notices per group on a daily basis.
         None found.
     </text>
     <button
+      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Create New Notice"
      label_selected="Create New Notice"
      layout="topleft"
      left_delta="0"
      name="create_new_notice"
      top_delta="-2"
-     width="150" />
+     width="125" />
     <button
+      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Refresh"
      label_selected="Refresh List"
      layout="topleft"
-     left_pad="164"
+     left_pad="70"
      name="refresh_notices"
      top_delta="0"
-     width="90" />
+     width="75" />
     <panel
-     follows="all"
+     follows="left|top"
      height="268"
      label="Create New Notice"
      layout="topleft"
      left="1"
      name="panel_create_new_notice"
-     top="198"
-     width="418">
+     top="225"
+     width="270">
         <text
+         follows="left|top"
          type="string"
          length="1"
          font="SansSerifBig"
@@ -130,25 +139,25 @@ Notice lists are limited to 200 notices per group on a daily basis.
          left="7"
          mouse_opaque="false"
          name="lbl"
-         top="2"
-         width="436">
+         top_pad="10"
+         width="270">
             Create a Notice
         </text>
         <text
+         follows="left|top"
          type="string"
+         word_wrap="true"
          length="1"
-         height="16"
+         height="90"
          layout="topleft"
          left_delta="0"
          name="lbl2"
          top_pad="4"
-         width="436">
-            You must enter a subject to send a notice. You can add a single
-item to a notice by dragging it from your inventory to this 
-panel. Attached items must be copiable and transferrable,
-and you can&apos;t send a folder.
+         width="196">
+            You must enter a subject to send a notice. You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can&apos;t send a folder.
         </text>
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -156,7 +165,7 @@ and you can&apos;t send a folder.
          layout="topleft"
          left_delta="0"
          name="lbl3"
-         top_pad="47"
+         top_pad="10"
          width="55">
             Subject:
         </text>
@@ -165,12 +174,13 @@ and you can&apos;t send a folder.
          border_thickness="1"
          height="16"
          layout="topleft"
-         left_pad="3"
+         left_pad="2"
          max_length="63"
          name="create_subject"
          top_delta="0"
-         width="264" />
+         width="200" />
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -178,21 +188,22 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl4"
-         top="103"
+         top_pad="2"
          width="55">
             Message:
         </text>
         <text_editor
-         height="120"
+         height="75"
          hide_scrollbar="true"
          layout="topleft"
          left_pad="3"
          max_length="511"
          name="create_message"
-         top_delta="2"
-         width="346"
+         top_delta="0"
+         width="200"
          word_wrap="true" />
         <text
+         follows="left|top"
          type="string"
          length="1"
          halign="right"
@@ -200,7 +211,7 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl5"
-         top="228"
+         top_pad="2"
          width="55">
             Attach:
         </text>
@@ -208,12 +219,12 @@ and you can&apos;t send a folder.
          enabled="false"
          height="16"
          layout="topleft"
-         left_pad="4"
+         left_pad="2"
          max_length="63"
          mouse_opaque="false"
          name="create_inventory_name"
-         top_delta="2"
-         width="211" />
+         top_delta="0"
+         width="200" />
         <icon
          height="16"
          layout="topleft"
@@ -222,31 +233,35 @@ and you can&apos;t send a folder.
          top_delta="0"
          width="16" />
         <button
+         follows="left|top"
          height="20"
+         font="SansSerifSmall"
          label="Remove Attachment"
          label_selected="Remove Attachment"
          layout="topleft"
-         left_pad="197"
+         left_pad="-15"
          name="remove_attachment"
-         top_delta="-4"
+         top_delta="20"
          width="135" />
         <button
+         follows="left|top"
          height="20"
-         label="Send Notice"
+         font="SansSerifSmall"
+         label="Send"
          label_selected="Send Notice"
          layout="topleft"
-         left_delta="0"
+         left_delta="140"
          name="send_notice"
-         top_delta="20"
-         width="135" />
+         top_delta="0"
+         width="60" />
         <panel
          bevel_style="in"
          border="true"
          height="76"
          layout="topleft"
-         left="335"
+         left="200"
          name="drop_target2"
-         top="20"
+         top="28"
          width="76" />
         <icon
          height="64"
@@ -255,7 +270,7 @@ and you can&apos;t send a folder.
          left_delta="5"
          mouse_opaque="true"
          name="drop_icon"
-         top="25"
+         top="35"
          width="64" />
         <group_drop_target
          height="466"
@@ -264,17 +279,17 @@ and you can&apos;t send a folder.
          name="drop_target"
          tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
          top="-198"
-         width="422" />
-    </panel>
+         width="280" />
+   </panel> 
     <panel
-     follows="all"
+     follows="left|top"
      height="268"
      label="View Past Notice"
      layout="topleft"
-     left_delta="0"
+     left="1"
      name="panel_view_past_notice"
-     top_delta="0"
-     width="418">
+     top="225"
+     width="270">
         <text
          type="string"
          length="1"
@@ -284,19 +299,20 @@ and you can&apos;t send a folder.
          left="7"
          mouse_opaque="false"
          name="lbl"
-         top="2"
-         width="436">
+         top_pad="10"
+         width="270">
             Archived Notice
         </text>
         <text
          type="string"
          length="1"
          height="16"
+         word_wrap="true"
          layout="topleft"
          left_delta="0"
          name="lbl2"
-         top_pad="4"
-         width="436">
+         top_pad="10"
+         width="270">
             To send a new notice, click the &apos;Create New Notice&apos; button above.
         </text>
         <text
@@ -318,12 +334,12 @@ and you can&apos;t send a folder.
          enabled="false"
          height="16"
          layout="topleft"
-         left_pad="3"
+         left_pad="2"
          max_length="63"
          name="view_subject"
          top_delta="0"
          visible="false"
-         width="346" />
+         width="210" />
         <text
          type="string"
          length="1"
@@ -332,30 +348,32 @@ and you can&apos;t send a folder.
          layout="topleft"
          left="7"
          name="lbl4"
-         top="80"
+         top_pad="5"
          visible="false"
          width="55">
             Message:
         </text>
         <text_editor
          enabled="false"
-         height="206"
+         height="100"
          hide_scrollbar="true"
          layout="topleft"
-         left_delta="0"
+         left_pad="3"
          max_length="511"
          name="view_message"
-         top_delta="-42"
-         width="404"
+         top_delta="2"
+         width="210"
          word_wrap="true" />
         <button
+         follows="left|top"
          height="20"
+         font="SansSerifSmall"
          label="Open Attachment"
          label_selected="Open Attachment"
          layout="topleft"
-         left_delta="0"
+         left_delta="-60"
          name="open_attachment"
-         top_pad="4"
+         top_pad="20"
          width="110" />
         <line_editor
          enabled="false"
@@ -366,7 +384,7 @@ and you can&apos;t send a folder.
          mouse_opaque="false"
          name="view_inventory_name"
          top_delta="1"
-         width="264" />
+         width="145" />
         <icon
          height="16"
          layout="topleft"
@@ -375,4 +393,4 @@ and you can&apos;t send a folder.
          top_delta="0"
          width="16" />
     </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index c758da4b63..750f84fbb3 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- height="466"
+ height="514"
  label="Members &amp; Roles"
  layout="topleft"
  left="1"
  name="roles_tab"
  top="466"
- width="418">
+ width="280">
     <panel.string
      name="default_needs_apply_text">
         There are unapplied changes on the current sub-tab.
@@ -19,20 +19,22 @@
     <panel.string
      name="help_text" />
     <button
+     follows="left|top"
      height="16"
      label="?"
      layout="topleft"
-     left="391"
+     left="250"
      name="help_button"
      top="8"
      width="20" />
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left="7"
      name="members_header"
      top="0"
-     width="380">
+     width="273">
         <text
          type="string"
          length="1"
@@ -48,24 +50,25 @@
         <text
          type="string"
          length="1"
-         height="32"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="static2"
          top_pad="4"
-         width="400">
-            Group Members are assigned Roles with Abilities. These settings can 
-easily be customized, allowing for greater organization and flexibility.
+         width="270">
+            Group Members are assigned Roles with Abilities. These settings can easily be customized, allowing for greater organization and flexibility.
         </text>
     </panel>
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left_delta="0"
      name="roles_header"
      top_delta="0"
      visible="false"
-     width="380">
+     width="280">
         <text
          type="string"
          length="1"
@@ -81,58 +84,63 @@ easily be customized, allowing for greater organization and flexibility.
         <text
          type="string"
          length="1"
-         height="16"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="role_properties_modifiable"
          top_pad="4"
          visible="false"
-         width="394">
+         width="270">
             Select a Role below.  You can modify its Name, Description and Member Title.
         </text>
         <text
          type="string"
          length="1"
-         height="16"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="role_properties_not_modifiable"
          top_delta="0"
-         width="394">
+         width="270">
             Select a Role below to see its properties, Members and allowed Abilities.
         </text>
         <text
          type="string"
          length="1"
+         word_wrap="true"
          height="16"
          layout="topleft"
          left_delta="0"
          name="role_actions_modifiable"
-         top_delta="14"
+         top_delta="24"
          visible="false"
-         width="394">
+         width="270">
             You can also assign Abilities to the Role.
         </text>
         <text
          type="string"
          length="1"
+         word_wrap="true"
          height="16"
          layout="topleft"
          left_delta="0"
          name="role_actions_not_modifiable"
          top_delta="0"
-         width="394">
+         width="270">
             You may view, but not modify, assigned Abilities.
         </text>
     </panel>
     <panel
+     follows="left|top"
      height="24"
      layout="topleft"
      left_delta="0"
      name="actions_header"
      top_delta="20"
      visible="false"
-     width="380">
+     width="280">
         <text
          type="string"
          length="1"
@@ -148,14 +156,14 @@ easily be customized, allowing for greater organization and flexibility.
         <text
          type="string"
          length="1"
-         height="32"
+         word_wrap="true"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="static2"
          top_pad="4"
-         width="394">
-            You can view an Ability&apos;s Description and which Roles and Members can 
-execute the Ability.
+         width="270">
+            You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.
         </text>
     </panel>
     <tab_container
@@ -164,8 +172,8 @@ execute the Ability.
      left_delta="-1"
      name="roles_tab_container"
      tab_position="top"
-     top_pad="10"
-     width="406">
+     top="85"
+     width="275">
         <panel
          border="true"
          height="164"
@@ -175,7 +183,7 @@ execute the Ability.
          name="members_sub_tab"
          tool_tip="Members"
          top="16"
-         width="406">
+         width="275">
             <panel.string
              name="help_text">
                 You can add or remove Roles assigned to Members.
@@ -222,36 +230,38 @@ clicking on their names.
              multi_select="true"
              name="member_list"
              top="24"
-             width="396">
+             width="265">
                 <name_list.columns
-                 label="Member Name"
+                 label="Member"
                  name="name"
-                 width="136" />
+                 width="90" />
                 <name_list.columns
-                 label="Donated Tier"
+                 label="Donations"
                  name="donated"
-                 width="136" />
+                 width="95" />
                 <name_list.columns
-                 label="Last Login"
+                 label="Online"
                  name="online"
-                 width="116" />
+                 width="80" />
             </name_list>
             <button
              height="19"
-             label="Invite New Member ..."
+             font="SansSerifSmall"
+             label="Invite"
              layout="topleft"
              left_delta="0"
              name="member_invite"
              top_pad="1"
-             width="146" />
+             width="100" />
             <button
              height="19"
-             label="Eject From Group"
+             font="SansSerifSmall"
+             label="Eject"
              layout="topleft"
-             left_pad="103"
+             left_pad="65"
              name="member_eject"
              top_delta="0"
-             width="146" />
+             width="100" />
             <icon
              height="16"
              image_name="inv_folder_plain_closed.tga"
@@ -268,7 +278,7 @@ clicking on their names.
          left_delta="0"
          name="roles_sub_tab"
          top_delta="0"
-         width="398">
+         width="275">
             <panel.string
              name="help_text">
                 Roles have a title and an allowed list of Abilities
@@ -332,36 +342,38 @@ including the Everyone and Owner Roles.
              left="4"
              name="role_list"
              top="23"
-             width="396">
+             width="265">
                 <scroll_list.columns
-                 label="Role Name"
+                 label="Role"
                  name="name"
-                 width="126" />
+                 width="80" />
                 <scroll_list.columns
                  label="Title"
                  name="title"
-                 width="186" />
+                 width="90" />
                 <scroll_list.columns
                  label="Members"
                  name="members"
-                 width="76" />
+                 width="95" />
             </scroll_list>
             <button
              height="19"
-             label="Create New Role ..."
+             font="SansSerifSmall"
+             label="Create New Role"
              layout="topleft"
              left_delta="0"
              name="role_create"
              top_pad="2"
-             width="146" />
+             width="125" />
             <button
              height="19"
+             font="SansSerifSmall"
              label="Delete Role"
              layout="topleft"
-             left_pad="95"
+             left_pad="15"
              name="role_delete"
              top_delta="0"
-             width="146" />
+             width="125" />
         </panel>
         <panel
          border="true"
@@ -371,7 +383,7 @@ including the Everyone and Owner Roles.
          left_delta="0"
          name="actions_sub_tab"
          top_delta="0"
-         width="398">
+         width="275">
             <panel.string
              name="help_text">
                 Abilities allow Members in Roles to do specific
@@ -419,7 +431,7 @@ things in this group. There&apos;s a broad variety of Abilities.
              search_column="1"
              tool_tip="Select an Ability to view more details."
              top="23"
-             width="392">
+             width="265">
                 <scroll_list.columns
                  label=""
                  name="icon"
@@ -427,7 +439,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                 <scroll_list.columns
                  label=""
                  name="action"
-                 width="356" />
+                 width="247" />
             </scroll_list>
             <icon
              height="16"
@@ -438,13 +450,13 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="16" />
         </panel>
     </tab_container>
-    <panel
-     height="215"
+      <panel
+     height="50"
      layout="topleft"
      left_delta="1"
      name="members_footer"
      top_pad="20"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -463,21 +475,21 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="50"
+         left_pad="30"
          name="static2"
          top_delta="0"
-         width="150">
+         width="100">
             Allowed Abilities
         </text>
         <scroll_list
          draw_stripes="false"
          enabled="false"
-         height="198"
+         height="75"
          layout="topleft"
          left="0"
          name="member_assigned_roles"
          top="1"
-         width="145">
+         width="125">
             <scroll_list.columns
              label=""
              name="checkbox"
@@ -485,18 +497,18 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="role"
-             width="109" />
+             width="107" />
         </scroll_list>
         <scroll_list
          draw_stripes="false"
          enabled="false"
-         height="198"
+         height="75"
          layout="topleft"
          left_pad="5"
          name="member_allowed_actions"
          tool_tip="For Details of each Allowed Ability see the Abilities tab."
          top_delta="0"
-         width="254">
+         width="140">
             <scroll_list.columns
              label=""
              name="icon"
@@ -504,7 +516,7 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="action"
-             width="224" />
+             width="126" />
         </scroll_list>
     </panel>
     <panel
@@ -514,7 +526,7 @@ things in this group. There&apos;s a broad variety of Abilities.
      name="roles_footer"
      top_delta="0"
      visible="false"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -533,7 +545,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="50"
+         left_pad="40"
          name="static2"
          top_delta="0"
          width="100">
@@ -551,7 +563,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="20"
          name="role_name"
          top="0"
-         width="145">
+         width="130">
             Employees
         </line_editor>
         <text
@@ -578,7 +590,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="20"
          name="role_title"
          top_delta="16"
-         width="145">
+         width="130">
             (waiting)
         </line_editor>
         <text_editor
@@ -588,11 +600,11 @@ things in this group. There&apos;s a broad variety of Abilities.
          height="48"
          hide_scrollbar="true"
          layout="topleft"
-         left="150"
+         left="135"
          max_length="254"
          name="role_description"
          top="0"
-         width="254"
+         width="135"
          word_wrap="true">
             (waiting)
         </text_editor>
@@ -614,22 +626,22 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="30"
+         left_pad="20"
          name="static5"
          tool_tip="A list of Abilities the currently selected role can perform."
          top_delta="0"
-         width="240">
+         width="100">
             Allowed Abilities
         </text>
         <name_list
          draw_stripes="false"
          enabled="false"
-         height="105"
+         height="125"
          layout="topleft"
          left="0"
          name="role_assigned_members"
          top="74"
-         width="145" />
+         width="130" />
         <check_box
          height="16"
          label="Members are visible"
@@ -638,17 +650,17 @@ things in this group. There&apos;s a broad variety of Abilities.
          name="role_visible_in_list"
          tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group."
          top_pad="4"
-         width="361" />
+         width="130" />
         <scroll_list
          draw_stripes="false"
          height="125"
          layout="topleft"
-         left="150"
+         left="135"
          name="role_allowed_actions"
          search_column="2"
          tool_tip="For Details of each Allowed Ability see the Abilities tab."
          top="74"
-         width="254">
+         width="130">
             <scroll_list.columns
              label=""
              name="icon"
@@ -663,14 +675,14 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="220" />
         </scroll_list>
     </panel>
-    <panel
+   <panel
      height="215"
      layout="topleft"
      left_delta="0"
      name="actions_footer"
      top_delta="0"
      visible="false"
-     width="406">
+     width="270">
         <text
          type="string"
          length="1"
@@ -695,7 +707,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="512"
          name="action_description"
          top_delta="16"
-         width="404"
+         width="270"
          word_wrap="true">
             This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
         </text_editor>
@@ -708,7 +720,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left_delta="0"
          name="static2"
          top_pad="10"
-         width="145">
+         width="125">
             Roles with Ability
         </text>
         <text
@@ -717,10 +729,10 @@ things in this group. There&apos;s a broad variety of Abilities.
          font="SansSerif"
          height="16"
          layout="topleft"
-         left_pad="5"
+         left_pad="10"
          name="static3"
          top_delta="0"
-         width="200">
+         width="125">
             Members with Ability
         </text>
         <scroll_list
@@ -730,7 +742,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="action_roles"
          top="74"
-         width="145" />
+         width="130" />
         <name_list
          enabled="false"
          height="125"
@@ -738,6 +750,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          left_pad="5"
          name="action_members"
          top_delta="0"
-         width="254" />
+         width="135" />
     </panel>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index fa1abaa595..9d4c411201 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -8,15 +8,16 @@
  layout="topleft"
  name="navigation_bar"
  width="600">
-    <button
+     <button
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_back.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Left_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left="5"
      name="back_btn"
@@ -24,15 +25,17 @@
      tool_tip="Go back to previous location"
      top="8"
      width="20" />
+
     <button
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_forward.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Right_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left_pad="2"
      name="forward_btn"
@@ -44,11 +47,12 @@
      follows="left|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_home.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Home_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
      left_pad="5"
      name="home_btn"
@@ -68,69 +72,86 @@
      name="location_combo"
      top_delta="0"
      width="320">
+     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
+        <location_input.add_landmark_button
+         height="18"
+         name="location_combo_add"
+         width="20" />
+        <location_input.info_button
+         height="18"
+         name="location_combo_info"
+         width="20" />
+      -->
     </location_input>
+
+<!--     <button -->
+<!--      follows="right|top" -->
+<!--      height="20" -->
+<!--      image_disabled="TextField_Search_Off" -->
+<!--      image_disabled_selected="TextField_Search_Off" -->
+<!--      image_hover_selected="TextField_Search_Off" -->
+<!--      image_hover_unselected="TextField_Search_Off" -->
+<!--      image_selected="TextField_Search_Off" -->
+<!--      image_unselected="TextField_Search_Off" -->
+<!--      layout="topleft" -->
+<!--      left_pad="5" -->
+<!--      mouse_opaque="false" -->
+<!--      name="search_bg" -->
+<!--      picture_style="true" -->
+<!--      top_delta="0" -->
+<!--      width="168" /> -->
+    
     <button
      follows="right|top"
-     height="20"
-     image_disabled="navbar_bg_center.tga"
-     image_disabled_selected="navbar_bg_center.tga"
-     image_hover_selected="navbar_bg_center.tga"
-     image_hover_unselected="navbar_bg_center.tga"
-     image_selected="navbar_bg_center.tga"
-     image_unselected="navbar_bg_center.tga"
+     height="16"
+     image_disabled="Search"
+     image_disabled_selected="Search"
+     image_selected="Search"
+     image_unselected="Search"
      layout="topleft"
      left_pad="5"
-     mouse_opaque="false"
-     name="search_bg"
+     name="search_btn"
      picture_style="true"
-     top_delta="0"
-     width="168" />
+     scale_image="false"
+     tool_tip="Search"
+     top_delta="2"
+     width="16" />
+    
     <line_editor
      bevel_style="none"
      border_style="line"
+     border.border_thickness="0"
      commit_on_focus_lost="false"
      follows="right|top"
      halign="right"
      height="18"
-     label="Search"
+     label="Search All"
      layout="topleft"
-     left_delta="0"
+     left_pad="2"
      mouse_opaque="false"
      name="search_input"
-     tool_tip="Search"
-     top_delta="1"
-     width="152" />
-    <button
-     follows="right|top"
-     height="16"
-     image_disabled="status_search_btn.png"
-     image_disabled_selected="status_search_btn_pressed.png"
-     image_selected="status_search_btn_pressed.png"
-     image_unselected="status_search_btn.png"
-     layout="topleft"
-     left_delta="152"
-     name="search_btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Search"
-     top_delta="1"
-     width="16" />
+     tool_tip="Search All"
+     top_delta="-1"
+     width="135" /> 
+    
     <button
      follows="right|top"
      font="SansSerifSmall"
      height="20"
-     image_disabled="navbar_bg_button.tga"
-     image_disabled_selected="navbar_bg_button.tga"
-     image_overlay="navbar_help.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Help_Off"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
      layout="topleft"
-     left_pad="5"
+     left_pad="15"
      name="help_btn"
      picture_style="true"
      tool_tip="Help"
-     top_delta="-2"
+     top_delta="0"
      width="20" />
+
     <favorites_bar
      follows="left|right|top"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ae385731f9..e2597b4700 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -26,7 +26,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Nearby" name="nearby_panel"
     >
       <avatar_list
@@ -60,7 +60,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Friends" name="friends_panel"
      >
       <avatar_list
@@ -115,7 +115,7 @@
       layout="topleft"
       height="390" width="332"  
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright" 
       label="Groups" name="groups_panel"
      >
       <group_list
@@ -182,7 +182,7 @@
       layout="topleft"
       height="390" width="332"
       follows="left|top|right|bottom"
-      background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1"
+      background_visible="true" bevel_style="bright"
       label="Recent" name="recent_panel"
      >
       <avatar_list
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
new file mode 100644
index 0000000000..6b6191e6eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<panel
+ border="true"
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="408"
+ layout="topleft"
+ left="102"
+ name="advanced"
+ top="1"
+ width="517">
+        <text
+     type="string"
+     text_color="LabelSelectedDisabledColor"
+     length="1"
+     follows="left|top"
+     layout="topleft"
+     left="8"
+     name="text status"
+     top_pad="3"
+     width="280">
+Beware the Trout!
+    </text>
+        
+        <!-- ADVANCED -->
+
+    <check_box
+     control_name="SmallAvatarNames"
+     height="16"
+     initial_value="true"
+     label="Small Avatar Names"
+     layout="topleft"
+     left_delta="30"
+     name="small_avatar_names_checkbox"
+     top="20"
+     width="200" />
+    <check_box
+     control_name="ArrowKeysMoveAvatar"
+     height="16"
+     label="Arrow keys always move avatar when chatting"
+     layout="topleft"
+     left_delta="0"
+     name="arrow_keys_move_avatar_check"
+     top_pad="10"
+     width="237" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="text_box7"
+     top_pad="10"
+     width="128">
+        Bubble Chat:
+    </text>
+    <slider
+     control_name="ChatBubbleOpacity"
+     follows="left|top"
+     height="12"
+     increment="0.05"
+     initial_value="1"
+     label="Opacity"
+     layout="topleft"
+     left_delta="0"
+     name="bubble_chat_opacity"
+     top_pad="10"
+     width="200" />
+    
+        <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="UI Size:"
+     top_pad="10"
+     width="100">
+        UI Size:
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="UIScaleFactor"
+     decimal_digits="2"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_delta="0"
+     max_val="1.4"
+     min_val="0.75"
+     name="ui_scale_slider"
+     top_pad="10"
+     width="180" />
+    <spinner
+     control_name="UIScaleFactor"
+     height="16"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_pad="10"
+     max_val="1.4"
+     min_val="0.75"
+     name="ui_scale_slider"
+     top_delta="0"
+     width="58" />
+    <check_box
+     control_name="UIAutoScale"
+     height="16"
+     label="Resolution independent scale"
+     layout="topleft"
+     left="30"
+     name="ui_auto_scale"
+     top_pad="10"
+     width="256" />
+    <!--text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="DisplayResLabel"
+     top_pad="10"
+     width="128">
+        Display Resolution:
+    </text>
+    <combo_box
+     height="18"
+     layout="topleft"
+     left_pad="5"
+     name="fullscreen combo"
+     top_delta="-1"
+     width="150" /-->
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="AspectRatioLabel1"
+     tool_tip="width / height"
+     top_pad="5"
+     width="160">
+        Aspect Ratio:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     height="16"
+     layout="topleft"
+     left_pad="0"
+     max_chars="100"
+     name="aspect_ratio"
+     tool_tip="width / height"
+     top_delta="0"
+     width="150">
+        <combo_box.item
+         enabled="true"
+         label="4:3 (Standard CRT)"
+         value="1.333333" />
+        <combo_box.item
+         enabled="true"
+         label="5:4 (1280x1024 LCD)"
+         value="1.25" />
+        <combo_box.item
+         enabled="true"
+         label="8:5 (Widescreen)"
+         value="1.6" />
+        <combo_box.item
+         enabled="true"
+         label="16:9 (Widescreen)"
+         value="1.7777777" />
+    </combo_box>
+    <check_box
+     control_name="FullScreenAutoDetectAspectRatio"
+     height="16"
+     label="Auto-detect ratio"
+     layout="topleft"
+     left_pad="5"
+     name="aspect_auto_detect"
+     top_delta="1"
+     width="256">
+        <check_box.commit_callback
+         function="Pref.AutoDetectAspect" />
+    </check_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name=" Camera Options:"
+     top_pad="10"
+     width="266">
+        Camera Options:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="camera_fov_label"
+     top_pad="10"
+     width="128">
+        Camera View Angle:
+    </text>
+    <slider 
+     can_edit_text="true"
+	 control_name="CameraAngle"
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.025"
+     initial_value="1.57"
+     layout="topleft"
+     left="128"
+     max_val="2.97"
+     min_val="0.17"
+     name="camera_fov"
+     show_text="false"
+     top_delta="0"
+     width="128" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Camera Follow Distance:"
+     top_pad="10"
+     width="128">
+        Camera Follow Distance:
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="CameraOffsetScale"
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.025"
+     initial_value="1"
+     layout="topleft"
+     left_delta="128"
+     max_val="3"
+     min_val="0.5"
+     name="camera_offset_scale"
+     show_text="false"
+     top_delta="0"
+     width="128" />
+    
+        <check_box
+     control_name="EditCameraMovement"
+     height="16"
+     label="Automatic Edit Camera Movement"
+     layout="topleft"
+     left="10"
+     name="edit_camera_movement"
+     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+     top_pad="5"
+     width="201" />
+    <check_box
+     control_name="AppearanceCameraMovement"
+     height="16"
+     label="Automatic Appearance Camera Movement"
+     layout="topleft"
+     left_pad="5"
+     name="appearance_camera_movement"
+     tool_tip="Use automatic camera positioning while in edit mode"
+     top_delta="0"
+     width="242" />
+
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="text2"
+     top_pad="5"
+     width="128">
+        Avatar Display Options:
+    </text>
+    <check_box
+     control_name="FirstPersonAvatarVisible"
+     height="16"
+     label="Show Avatar in Mouselook"
+     layout="topleft"
+     left_pad="10"
+     name="first_person_avatar_visible"
+     top_delta="0"
+     width="256" />
+
+
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index bda437ab29..1d32229c9b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,25 +9,13 @@
  name="chat"
  top="1"
  width="517">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     top="10"
-     width="128">
-        Chat Font Size:
-    </text>
     <radio_group
      height="30"
      layout="topleft"
-     left_pad="8"
+     left="30"
 	 control_name="ChatFontSize"
      name="chat_font_size"
-     top_delta="0"
+     top="10"
      width="331">
         <radio_item
          height="16"
@@ -35,8 +23,8 @@
          layout="topleft"
          left="0"
          name="radio"
-         top="8"
-         width="98" />
+         top="10"
+         width="125" />
         <radio_item
          height="16"
          label="Medium"
@@ -44,7 +32,7 @@
          left_pad="12"
          name="radio2"
          top_delta="0"
-         width="98" />
+         width="125" />
         <radio_item
          height="16"
          label="Large"
@@ -52,45 +40,56 @@
          left_pad="12"
          name="radio3"
          top_delta="0"
-         width="98" />
+         width="125" />
     </radio_group>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     name="text_box2"
-     top="54"
-     width="128">
-        Chat Color:
-    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      control_name="UserChatColor"
      follows="left|top"
      height="47"
-     label="You"
      layout="topleft"
-     left_pad="8"
+     left="30"
      name="user"
-     top_delta="-1"
+     top_pad="10"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Me
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      control_name="AgentChatColor"
      follows="left|top"
      height="47"
-     label="Others"
      layout="topleft"
-     left_pad="10"
+     left="180"
      name="agent"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Others
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -98,13 +97,25 @@
      control_name="IMChatColor"
      follows="left|top"
      height="47"
-     label="IM"
      label_width="60"
      layout="topleft"
-     left_pad="10"
+     left="350"
      name="im"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
+        <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        IM
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -112,13 +123,25 @@
      control_name="SystemChatColor"
      follows="left|top"
      height="47"
-     label="System"
      label_width="44"
      layout="topleft"
-     left_pad="10"
+     left="30"
      name="system"
-     top_delta="0"
+     top_pad="40"
      width="44" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        System
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
@@ -126,63 +149,35 @@
      control_name="ScriptErrorColor"
      follows="left|top"
      height="47"
-     label="Errors"
      layout="topleft"
-     left_pad="10"
+     left="180"
      name="script_error"
-     top_delta="0"
+     top_pad="-17"
      width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0.7 0.9 0.7 1"
-     control_name="ObjectChatColor"
+    <text
+     type="string"
+     length="1"
      follows="left|top"
-     height="47"
-     label="Objects"
+     height="10"
      layout="topleft"
-     left="148"
-     name="objects"
-     top="103"
-     width="44" />
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Errors
+    </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.7 0.9 0.7 1"
-     control_name="llOwnerSayChatColor"
-     follows="left|top"
-     height="47"
-     label="Owner"
-     layout="topleft"
-     left_pad="10"
-     name="owner"
-     top_delta="0"
-     width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0 0 0 1"
-     control_name="BackgroundChatColor"
-     follows="left|top"
-     height="47"
-     label="Bubble"
-     layout="topleft"
-     left_pad="10"
-     name="background"
-     top_delta="0"
-     width="44" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     can_apply_immediately="true"
-     color="0.6 0.6 1 1"
-     control_name="HTMLLinkColor"
+     control_name="ObjectChatColor"
      follows="left|top"
      height="47"
-     label="URLs"
      layout="topleft"
-     left_pad="10"
-     name="links"
-     top_delta="0"
+     left="350"
+     name="objects"
+     top_pad="-17"
      width="44" />
     <text
      type="string"
@@ -190,56 +185,50 @@
      follows="left|top"
      height="10"
      layout="topleft"
-     left="12"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box3"
-     top="168"
-     width="135">
-        Chat Console:
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Objects
     </text>
-    <spinner
-     control_name="ChatPersistTime"
-     decimal_digits="0"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0.7 0.9 0.7 1"
+     control_name="llOwnerSayChatColor"
      follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="10"
-     label="Fade chat after"
-     label_width="80"
+     height="47"
      layout="topleft"
-     left_pad="1"
-     max_val="60"
-     min_val="2"
-     name="fade_chat_time"
-     top_delta="2"
-     width="130" />
+     left="30"
+     name="owner"
+     top_pad="40"
+     width="44" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left_pad="4"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box4"
-     top_delta="0"
-     width="80">
-        (seconds)
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Owner
     </text>
-    <spinner
-     control_name="ConsoleMaxLines"
-     decimal_digits="0"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0 0 0 1"
+     control_name="BackgroundChatColor"
      follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="10"
+     height="47"
      layout="topleft"
-     left_delta="58"
-     max_val="50"
-     min_val="1"
-     name="max_chat_count"
-     top_delta="0"
-     width="60" />
+     left="180"
+     name="background"
+     top_pad="-17"
+     width="44" />
     <text
      type="string"
      length="1"
@@ -248,123 +237,62 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="text_box5"
-     top_delta="0"
-     width="60">
-        (# lines)
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        Bubble
     </text>
-    <slider
-     control_name="ConsoleBackgroundOpacity"
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     can_apply_immediately="true"
+     color="0.6 0.6 1 1"
+     control_name="HTMLLinkColor"
      follows="left|top"
-     height="12"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
-     layout="topleft"
-     left="148"
-     name="console_opacity"
-     top="193"
-     width="200" />
-    <check_box
-     control_name="ChatFullWidth"
-     height="16"
-     label="Use full screen width  (Requires restart)"
+     height="47"
      layout="topleft"
-     left_delta="0"
-     name="chat_full_width_check"
-     top_pad="9"
-     width="239" />
+     left="350"
+     name="links"
+     top_pad="-17"
+     width="44" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left="12"
+     left_pad="5"
      mouse_opaque="false"
-     name="text_box6"
-     top="245"
-     width="135">
-        Chat Options:
+     name="text_box2"
+     top_delta="5"
+     width="95">
+        URLs
     </text>
     <check_box
-     control_name="CloseChatOnReturn"
-     height="16"
-     label="Close chat bar after hitting return"
-     layout="topleft"
-     left_pad="1"
-     name="close_chat_on_return_check"
-     top_delta="2"
-     width="237" />
-    <check_box
-     control_name="ArrowKeysMoveAvatar"
-     height="16"
-     label="Arrow keys always move avatar when chatting"
-     layout="topleft"
-     left_delta="0"
-     name="arrow_keys_move_avatar_check"
-     top_pad="4"
-     width="237" />
-    <check_box
-     control_name="ChatShowTimestamps"
-     height="16"
-     label="Show timestamps in Local Chat"
-     layout="topleft"
-     left_delta="0"
-     name="show_timestamps_check"
-     top_pad="4"
-     width="237" />
-    <check_box
-     control_name="ScriptErrorsAsChat"
-     height="16"
-     label="Show script errors and warnings as regular chat"
-     layout="topleft"
-     left_delta="0"
-     name="script_errors_as_chat"
-     top_pad="4"
-     width="275" />
-    <check_box
      control_name="PlayTypingAnim"
      height="16"
      initial_value="true"
      label="Play typing animation when chatting"
      layout="topleft"
-     left_delta="0"
+     left="30"
      name="play_typing_animation"
-     top_pad="4"
-     width="237" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="12"
-     mouse_opaque="false"
-     name="text_box7"
-     top="359"
-     width="128">
-        Bubble Chat:
-    </text>
+     top_pad="40"
+     width="400" />
     <check_box
      control_name="UseChatBubbles"
      height="16"
      label="Show chat bubbles"
      layout="topleft"
-     left_pad="8"
+     left_delta="0"
      name="bubble_text_chat"
-     top_delta="1"
-     width="237" />
-    <slider
-     control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="12"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
+     top_pad="5"
+     width="400" />
+    <check_box
+     enabled="false"
+     height="16"
+     label="Email me IMs when I'm offline"
      layout="topleft"
      left_delta="0"
-     name="bubble_chat_opacity"
-     top_pad="4"
-     width="200" />
+     name="send_im_to_email"
+     top_pad="5"
+     width="400" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index b30bda3e59..8b88afa9b2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -9,338 +9,28 @@
  name="general_panel"
  top="1"
  width="517">
-    <combo_box
-     control_name="LoginLocation"
-     follows="left|bottom"
-     height="18"
-     layout="topleft"
-     left_delta="151"
-     name="start_location_combo"
-     top="7"
-     width="155">
-        <combo_box.item
-         label="My Last Location"
-         value="last" />
-        <combo_box.item
-         label="My Home"
-         value="home" />
-    </combo_box>
-    <check_box
-     control_name="ShowStartLocation"
-     height="16"
-     initial_value="true"
-     label="Show Start Location on Login Screen"
-     layout="topleft"
-     left_delta="0"
-     name="show_location_checkbox"
-     top_pad="3"
-     width="256" />
-    <combo_box
-     control_name="RenderName"
-     height="18"
-     layout="topleft"
-     left_delta="4"
-     name="fade_out_combobox"
-     top_pad="7"
-     width="146">
-        <combo_box.item
-         label="Never"
-         value="0" />
-        <combo_box.item
-         label="Show Temporarily"
-         value="1" />
-        <combo_box.item
-         label="Always"
-         value="2" />
-    </combo_box>
-    <check_box
-     control_name="SmallAvatarNames"
-     height="16"
-     initial_value="true"
-     label="Small Avatar Names"
-     layout="topleft"
-     left_delta="-4"
-     name="small_avatar_names_checkbox"
-     top_pad="9"
-     width="200" />
-    <check_box
-     control_name="RenderNameHideSelf"
-     height="16"
-     label="Hide My Name On My Screen"
-     layout="topleft"
-     left_delta="0"
-     name="show_my_name_checkbox"
-     top_pad="2"
-     width="200" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="group_titles_textbox"
-     top="120"
-     width="394">
-        Group Titles:
-    </text>
-    <check_box
-     control_name="RenderHideGroupTitleAll"
-     height="16"
-     label="Hide All Group Titles"
-     layout="topleft"
-     left_delta="141"
-     name="show_all_title_checkbox"
-     top_delta="0"
-     width="256" />
-    <check_box
-     control_name="RenderHideGroupTitle"
-     height="16"
-     label="Hide My Group Title"
-     layout="topleft"
-     left_delta="0"
-     name="show_my_title_checkbox"
-     top_pad="2"
-     width="256" />
-    <color_swatch
-     border_color="0.45098 0.517647 0.607843 1"
-     control_name="EffectColor"
-     follows="left|top"
-     height="48"
-     layout="topleft"
-     left_delta="2"
-     name="effect_color_swatch"
-     tool_tip="Click to open Color Picker"
-     top_pad="8"
-     width="32" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="UI Size:"
-     top="203"
-     width="128">
-        UI Size:
-    </text>
-    <spinner
-     control_name="UIScaleFactor"
-     height="16"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     left_pad="16"
-     max_val="1.4"
-     min_val="0.75"
-     name="ui_scale_slider"
-     top_delta="-2"
-     width="58" />
-    <check_box
-     control_name="UIAutoScale"
-     height="16"
-     label="Use resolution independent scale"
-     layout="topleft"
-     left_delta="-3"
-     name="ui_auto_scale"
-     top_pad="3"
-     width="256" />
-    <spinner
-     control_name="AFKTimeout"
-     decimal_digits="0"
-     follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="300"
-     label="Away Timeout:"
-     label_width="141"
-     layout="topleft"
-     left="10"
-     max_val="600"
-     min_val="30"
-     name="afk_timeout_spinner"
-     top="244"
-     width="202" />
-    <check_box
-     control_name="NotifyMoneyChange"
-     height="16"
-     label="Notify when Linden dollars (L$) spent or received"
-     layout="topleft"
-     left="151"
-     name="notify_money_change_checkbox"
-     top="270"
-     width="256" />
-    <text
+   <text
      type="string"
      length="1"
      follows="left|top"
      height="10"
      layout="topleft"
-     left="10"
-     name="maturity_desired_label"
-     top="312"
-     width="394">
-        Rating:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="141"
-     name="maturity_desired_prompt"
-     top_delta="0"
-     width="394">
-        I want to access content rated:
-    </text>
-    <combo_box
-     control_name="PreferredMaturity"
-     height="18"
-     layout="topleft"
-     left_delta="164"
-     name="maturity_desired_combobox"
-     top_delta="-2"
-     width="150">
-        <combo_box.item
-         label="PG, Mature and Adult"
-         value="42" />
-        <combo_box.item
-         label="PG and Mature"
-         value="21" />
-        <combo_box.item
-         label="PG only"
-         value="13" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="maturity_desired_textbox"
-     top_delta="2"
-     width="150">
-        PG only
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="start_location_textbox"
-     top="10"
-     width="394">
-        Start Location:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="show_names_textbox"
-     top_pad="34"
-     width="394">
-        Show Names:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     name="effects_color_textbox"
-     top_pad="110"
-     width="394">
-        Color For My Effects:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="220"
-     name="seconds_textbox"
-     top="244"
-     width="128">
-        seconds
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left="10"
-     name="crash_report_textbox"
-     top="344"
-     width="394">
-        Crash reports:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left_delta="0"
+     left="30"
      name="language_textbox"
-     top_pad="4"
-     width="394">
-        Language:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left_delta="293"
-     name="language_textbox2"
-     top_delta="1"
+     top="10"
      width="400">
-        (Requires restart for full effect)
+        Language:
     </text>
     <combo_box
-     control_name="CrashSubmitBehavior"
-     height="18"
-     layout="topleft"
-     left="153"
-     name="crash_behavior_combobox"
-     top="344"
-     width="146">
-        <combo_box.item
-         enabled="true"
-         label="Ask before sending"
-         value="Ask before sending" />
-        <combo_box.item
-         enabled="true"
-         label="Always send"
-         value="Always send" />
-        <combo_box.item
-         enabled="true"
-         label="Never send"
-         value="Never send" />
-    </combo_box>
-    <combo_box
-     allow_text_entry="true"
      control_name="Language"
      follows="left|bottom"
-     height="16"
+     height="18"
      layout="topleft"
-     left_delta="0"
+     left_delta="50"
      max_chars="135"
      name="language_combobox"
-     top_pad="4"
-     width="146">
+     top_pad="10"
+     width="155">
         <combo_box.item
          enabled="true"
          label="System Default"
@@ -414,14 +104,173 @@
          label="Test Language"
          value="test" />
     </combo_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="175"
+     name="language_textbox2"
+     top_delta="1"
+     width="400">
+        (Requires restart)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="maturity_desired_prompt"
+     top_pad="10"
+     width="400">
+        I want to access content rated:
+    </text>
+    <combo_box
+     control_name="PreferredMaturity"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_delta="50"
+     name="start_location_combo"
+     top_pad="10"
+     width="155">
+        <combo_box.item
+         label="PG, Mature and Adult"
+         value="42" />
+        <combo_box.item
+         label="PG and Mature"
+         value="21" />
+        <combo_box.item
+         label="PG"
+         value="13" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="start_location_textbox"
+     top_delta="20"
+     width="394">
+        Start Location:
+    </text>
+    <combo_box
+     control_name="LoginLocation"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_delta="50"
+     name="start_location_combo"
+     top_pad="10"
+     width="155">
+        <combo_box.item
+         label="My Last Location"
+         value="last" />
+        <combo_box.item
+         label="My Home"
+         value="home" />
+    </combo_box>
+    <check_box
+     control_name="ShowStartLocation"
+     height="16"
+     initial_value="true"
+     label="Show on Login"
+     layout="topleft"
+     left_delta="175"
+     name="show_location_checkbox"
+     top_delta="1"
+     width="256" />        
+        
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="10"
+    layout="topleft"
+    left="30"
+    name="name_tags_textbox"
+    top_pad="10"
+    width="400">
+       Name tags:
+   </text>
+   <!-- THIS IS A NEW RADIO GROUP ADDED BY LIS -->
+   <radio_group
+     height="30"
+     layout="topleft"
+     left_delta="50"
+	 control_name="NameTags"
+     name="Name_Tag_Preference"
+     top_pad="10">
+        <radio_item
+         height="16"
+         label="On"
+         layout="topleft"
+         left="0"
+         name="radio"
+         top_pad="0"
+         width="98" />
+        <radio_item
+         height="16"
+         label="Off"
+         layout="topleft"
+         left_pad="12"
+         name="radio2"
+         top_delta="0"
+         width="98" />
+        <radio_item
+         height="16"
+         label="Show briefly"
+         layout="topleft"
+         left_pad="12"
+         name="radio3"
+         top_delta="0"
+         width="98" />
+    </radio_group>
     <check_box
-     control_name="LanguageIsPublic"
+     control_name="RenderNameHideSelf"
      height="16"
-     label="Share language with objects"
+     label="Show my name"
      layout="topleft"
-     left_delta="-2"
-     name="language_is_public"
-     tool_tip="This lets in-world objects know your preferred language."
-     top_pad="2"
+     left_delta="0"
+     name="show_my_name_checkbox"
+     top_pad="5"
+     width="300" />
+   <check_box
+     control_name="RenderHideGroupTitleAll"
+     height="16"
+     label="Show group titles"
+     layout="topleft"
+     left_delta="0"
+     name="show_all_title_checkbox"
+     top_pad="5"
      width="256" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="effects_color_textbox"
+     top_pad="10"
+     width="400">
+        My Effects:
+    </text>
+    <color_swatch
+     border_color="0.45098 0.517647 0.607843 1"
+     control_name="EffectColor"
+     follows="left|top"
+     height="48"
+     layout="topleft"
+     left_delta="50"
+     name="effect_color_swatch"
+     tool_tip="Click to open Color Picker"
+     top_pad="10"
+     width="32" />
+    
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 8db8c8f31d..7b802fb5b3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,133 +17,34 @@
      name="aspect_ratio_text">
         [NUM]:[DEN]
     </panel.string>
-    <button
-     follows="left|top"
-     height="18"
-     label="?"
-     layout="topleft"
-     left="470"
-     name="GraphicsPreferencesHelpButton"
-     top="4"
-     width="22">
-        <button.commit_callback
-         function="Pref.OpenHelp" />
-    </button>
-    <check_box
-	 control_name="NotFullScreen"
-     height="16"
-     label="Run Second Life in a window"
-     layout="topleft"
-     left_delta="-460"
-     name="windowed mode"
-     top_delta="3"
-     width="100">
-        <check_box.commit_callback
-         function="Pref.OpenHelp" />
-    </check_box>
-    <text_editor
-	 make_visible_control="NotFullScreen"
-     type="string"
-     length="1"
-     bg_readonly_color="0 0 0 0"
-     enabled="false"
-     follows="left|top"
-     height="20"
-     hide_border="true"
-     hide_scrollbar="true"
-     layout="topleft"
-     left_delta="0"
-     max_length="65535"
-     name="FullScreenInfo"
-     tab_stop="false"
-     top_delta="16"
-     width="350"
-     word_wrap="true">
-        If unchecked, viewer will display full-screen when logged in.
-    </text_editor>
     <text
-	 make_visible_control="NotFullScreen"
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="0"
+     left="30"
      name="WindowSizeLabel"
-     top_pad="7"
+     top="10"
      width="128">
-        Window Size:
+        Window size:
     </text>
-    <combo_box
-	 make_visible_control="NotFullScreen"
-     height="18"
-     layout="topleft"
-     left_pad="47"
-     name="windowsize combo"
-     top_delta="-1"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label="640x480"
-         value="640 x 480" />
-        <combo_box.item
-         enabled="true"
-         label="800x600 "
-         value="800 x 600" />
-        <combo_box.item
-         enabled="true"
-         label="720x480 (NTSC)"
-         value="720 x 480" />
-        <combo_box.item
-         enabled="true"
-         label="768x576 (PAL)"
-         value="768 x 576" />
-        <combo_box.item
-         enabled="true"
-         label="1024x768"
-         value="1024 x 768" />
-    </combo_box>
-    <text
-	 make_invisible_control="NotFullScreen"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="-175"
-     name="DisplayResLabel"
-     top_delta="1"
-     width="128">
-        Display Resolution:
-    </text>
-    <combo_box
-	 make_invisible_control="NotFullScreen"
-     height="18"
-     layout="topleft"
-     left_pad="47"
-     name="fullscreen combo"
-     top_delta="-1"
-     width="150" />
-    <text
-	 make_invisible_control="NotFullScreen"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
+    <check_box
+     control_name="WindowFullScreen"
+     height="16"
+     label="Use fullscreen"
      layout="topleft"
-     left="10"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     top="27"
-     width="160">
-        Aspect Ratio:
-    </text>
+     left_delta="30"
+     name="windowed mode"
+     top_pad="5"
+     width="100">
+    </check_box>
     <combo_box
-	 make_invisible_control="NotFullScreen"
+	 make_visible_control="WindowFullScreen"
      allow_text_entry="true"
      height="16"
      layout="topleft"
-     left_pad="15"
+     left_delta="175"
      max_chars="100"
      name="aspect_ratio"
      tool_tip="width / height"
@@ -169,42 +70,17 @@
          function="setControlFalse"
 		 parameter="FullScreenAutoDetectAspectRatio" />
     </combo_box>
-    <check_box
-	 make_invisible_control="NotFullScreen"
-     control_name="FullScreenAutoDetectAspectRatio"
-     height="16"
-     label="Auto-detect ratio"
-     layout="topleft"
-     left_pad="23"
-     name="aspect_auto_detect"
-     top_delta="1"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="HigherText"
-     top="73"
-     width="80">
-        Quality and
-    </text>
-    <text
+     <text
      type="string"
      length="1"
      follows="left|top"
      height="12"
      layout="topleft"
-     left_delta="0"
-     name="QualityText"
-     top_pad="2"
-     width="95">
-        Performance:
+     left="30"
+     name="QualitySpeed"
+     top_pad="5"
+     width="400">
+        Quality and speed:
     </text>
     <text
      type="string"
@@ -212,9 +88,9 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="115"
+     left_delta="35"
      name="FasterText"
-     top="74"
+     top_pad="5"
      width="80">
         Faster
     </text>
@@ -224,80 +100,20 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="158"
-     name="ShadersPrefText"
-     top="93"
-     width="40">
-        Low
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText2"
+     left_delta="240"
+     name="BetterText"
      top_delta="0"
-     width="40">
-        Mid
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="40">
-        High
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_pad="7"
-     name="ShadersPrefText4"
-     top_delta="0"
-     width="40">
-        Ultra
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="334"
-     name="HigherText2"
-     top="68"
      width="80">
-        Higher
+        Better
     </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="0"
-     name="QualityText2"
-     top_pad="2"
-     width="95">
-        Quality
-    </text>
-    <icon
+        <icon
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="rounded_square.tga"
      layout="topleft"
-     left="173"
+     left="140"
      name="LowGraphicsDivet"
-     top="75"
+     top_delta="2"
      width="2" />
     <icon
      color="0.12 0.12 0.12 1"
@@ -343,29 +159,64 @@
 	 <slider.commit_callback
 			function="Pref.QualityPerformance"/>
 	</slider>		
-    <check_box
-     control_name="RenderCustomSettings"
-     height="16"
-     initial_value="true"
-     label="Custom"
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
      layout="topleft"
-     left_pad="70"
-     name="CustomSettings"
-     top_delta="1"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.ChangeCustom" />
-    </check_box>
-	<panel
-	 make_visible_control="RenderCustomSettings"
-     border="true"
+     left="130"
+     name="ShadersPrefText"
+     top_delta="20"
+     width="80">
+        Low
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText2"
+     top_delta="10"
+     width="80">
+        Mid
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText3"
+     top_delta="-10"
+     width="40">
+        High
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_delta="42"
+     name="ShadersPrefText4"
+     top_delta="10"
+     width="40">
+        Ultra
+    </text>
+    <panel
+	 make_visible_control="ShowAdvancedGraphicsSettings"
+     border="false"
 	 follows="top|left"
      height="260"
      label="CustomGraphics"
      layout="topleft"
      left="5"
      name="CustomGraphics Panel"
-     top="115"
+     top="117"
      width="485">
 		<text
 		type="string"
@@ -897,24 +748,37 @@
 	</panel>	
     <button
      height="20"
-     label="Recommended Settings"
+     label="Reset"
      layout="topleft"
-     left="130"
+     left="15"
      name="Defaults"
      top="380"
-     width="170">
+     width="155">
         <button.commit_callback
          function="Pref.HardwareDefaults" />
     </button>
     <button
+     control_name="ShowAdvancedGraphicsSettings"
+     height="20"
+     is_toggle="true"
+     label="Advanced"
+     layout="topleft"
+     left_pad="5"
+     name="Advanced"
+     top_delta="0"
+     width="155">
+        <button.commit_callback
+         function="Pref.ChangeCustom" />
+    </button>
+    <button
      height="20"
-     label="Hardware Options"
-     label_selected="Hardware Options"
+     label="Hardware"
+     label_selected="Hardware"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="GraphicsHardwareButton"
      top_delta="0"
-     width="170">
+     width="155">
         <button.commit_callback
          function="Pref.HardwareSettings" />
     </button>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index f99d629aed..1af3c6511d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -578,7 +578,7 @@
          top="0"
          width="50" />
     </panel>
-    <panel
+   <!-- <panel
      bottom="625"
      follows="bottom|left"
      height="30"
@@ -607,5 +607,5 @@
          name="edit_appearance_btn"
          top="0"
          width="130" />
-    </panel>
+    </panel> -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 6139bae874..4f23c4d26d 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -61,28 +61,28 @@
                      width="640" />
                     <text
                      follows="left|right|top"
-                     font="SansSerif"
+                     font="SansSerifHuge"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="20"
                      layout="topleft"
-                     left_delta="0"
+                     left_delta="47"
                      name="title_text"
                      text_color="LoginProgressBoxTextColor"
                      top_delta="50"
-                     width="640" />
+                     width="593" />
                     <text
                      follows="left|right|top"
                      font="SansSerif"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="20"
                      layout="topleft"
                      left_delta="0"
                      name="progress_text"
                      text_color="LoginProgressBoxTextColor"
                      top_pad="5"
-                     width="640" />
+                     width="593" />
                     <progress_bar
                      bottom="115"
                      color_bar="1 1 1 0.96"
@@ -94,17 +94,17 @@
                      right="-45" />
                     <text
                      follows="left|right|top|bottom"
-                     font="SansSerif"
+                     font="SansSerifLarge"
                      font_shadow="hard"
-                     halign="center"
+                     halign="left"
                      height="100"
                      layout="topleft"
-                     left="20"
-                     line_spacing="8"
+                     left="30"
+                     line_spacing="2"
                      name="message_text"
                      text_color="LoginProgressBoxTextColor"
                      top="145"
-                     width="600" />
+                     width="610" />
                 </layout_panel>
                 <layout_panel
                  height="200"
@@ -125,9 +125,9 @@
      follows="right|bottom"
      height="22"
      layout="topleft"
-     left="-86"
+     left="-106"
      name="cancel_btn"
      picture_style="true"
-     top="730"
-     width="70" />
+     top="700"
+     width="90" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 7bd548d464..8265ab3227 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="350"
  label="Covenant"
  layout="topleft"
  left="0"
  name="Covenant"
  top="320"
- width="480">
+ width="280">
     <panel.string
      name="can_resell">
         Purchased land in this region may be resold.
@@ -49,7 +49,7 @@
      mouse_opaque="false"
      name="estate_name_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Name:
     </text>
     <text
@@ -58,7 +58,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="estate_name_text"
      top_delta="0"
@@ -75,7 +75,7 @@
      mouse_opaque="false"
      name="estate_owner_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Owner:
     </text>
     <text
@@ -84,7 +84,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="estate_owner_text"
      top_delta="0"
@@ -102,7 +102,7 @@
      mouse_opaque="false" 
      name="estate_cov_lbl" 
      top_pad="5"
-     width="100">
+     width="75">
         Covenant:
     </text>
     <text
@@ -111,11 +111,11 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="covenant_timestamp_text"
      top_delta="0"
-     width="308">
+     width="167">
         Last Modified Wed Dec 31 16:00:00 1969
     </text>
     <button
@@ -136,11 +136,11 @@
      follows="left|top"
      height="100"
      layout="topleft"
-     left="110"
+     left="80"
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
-     width="340"
+     width="193"
      word_wrap="true">
         There is no Covenant provided for this Estate.
     </text_editor>
@@ -150,7 +150,7 @@
      height="18"
      label="Reset"
      layout="topleft"
-     left_delta="250"
+     left_delta="75"
      name="reset_covenant"
      top_pad="5"
      width="90" />
@@ -161,11 +161,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="120"
+     left="85"
      name="covenant_help_text"
      top_pad="10"
-     width="460">
-        Changes to the covenant will show on all parcels in the estate.
+     width="190">
+        Changes to the covenant will show
+on all parcels in the estate.
     </text>
     <text
      type="string"
@@ -175,9 +176,10 @@
      layout="topleft"
      left_delta="0"
      name="covenant_instructions"
-     top_pad="5"
-     width="465">
-        Drag and drop a notecard to change the Covenant for this Estate.
+     top_pad="15"
+     width="190">
+        Drag and drop a notecard to change
+the Covenant for this Estate.
     </text>
 
     <text
@@ -190,7 +192,7 @@
      left="5"
      mouse_opaque="false"
      name="region_section_lbl"
-     top_pad="5"
+     top_pad="10"
      width="100">
         Region
     </text>
@@ -204,7 +206,7 @@
      mouse_opaque="false"
      name="region_name_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Name:
     </text>
     <text
@@ -213,7 +215,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_name_text"
      top_delta="0"
@@ -230,7 +232,7 @@
      mouse_opaque="false"
      name="region_landtype_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Type:
     </text>
     <text
@@ -239,7 +241,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_landtype_text"
      top_delta="0"
@@ -256,7 +258,7 @@
      mouse_opaque="false"
      name="region_maturity_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Rating:
     </text>
     <text
@@ -265,7 +267,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="region_maturity_text"
      top_delta="0"
@@ -282,7 +284,7 @@
      mouse_opaque="false"
      name="resellable_lbl"
      top_pad="5"
-     width="100">
+     width="75">
         Resale:
     </text>
     <text
@@ -291,12 +293,13 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="resellable_clause"
      top_delta="0"
-     width="330">
-        Land in this region may not be resold.
+     width="190">
+        Land in this region may not be
+resold.
     </text>
     <text
      type="string"
@@ -307,8 +310,8 @@
      left="10"
      mouse_opaque="false"
      name="changeable_lbl"
-     top_pad="5"
-     width="100">
+     top_pad="10"
+     width="75">
         Subdivide:
     </text>
     <text
@@ -317,12 +320,13 @@
      follows="left|top"
      height="30"
      layout="topleft"
-     left_pad="10"
+     left_pad="0"
      mouse_opaque="false"
      name="changeable_clause"
      top_delta="0"
-     width="330">
-        Land in this region may not be joined/subdivided.
+     width="190">
+        Land in this region may not be
+joined/subdivided.
     </text>
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 22dc0aa0d0..6a43bf3c4b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -8,7 +8,7 @@
  left="0"
  name="Debug"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="220">
         unknown
     </text>
     <check_box
@@ -96,12 +96,13 @@
      enabled="false"
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Apply"
      layout="topleft"
      left="60"
      name="apply_btn"
      top="100"
-     width="100" />
+     width="80" />
     <text
      type="string"
      length="1"
@@ -120,7 +121,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="30"
+     left="20"
      name="resident_text_lbl"
      top="175"
      width="60">
@@ -139,25 +140,26 @@
      mouse_opaque="false"
      name="target_avatar_name"
      top_delta="-2"
-     width="180">
+     width="115">
         (none)
     </line_editor>
     <button
      follows="left|top"
      height="20"
-     label="Choose..."
+     font="SansSerifSmall"
+     label="Choose"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="choose_avatar_btn"
      top_delta="0"
-     width="80" />
-    <text
+     width="70" />
+   <text
      type="string"
      length="1"
      follows="left|top"
      height="20"
      layout="topleft"
-     left="30"
+     left="20"
      name="options_text_lbl"
      top="198"
      width="60">
@@ -165,7 +167,7 @@
     </text>
     <check_box
      height="20"
-     label="Return only those objects with scripts"
+     label="With scripts"
      layout="topleft"
      left_delta="60"
      name="return_scripts"
@@ -174,7 +176,7 @@
      width="80" />
     <check_box
      height="20"
-     label="Return only those objects on someone else&apos;s land"
+     label="On someone else&apos;s land"
      layout="topleft"
      left_delta="0"
      name="return_other_land"
@@ -183,7 +185,7 @@
      width="80" />
     <check_box
      height="20"
-     label="Return objects in every region of this estate"
+     label="In every region of this estate"
      layout="topleft"
      left_delta="0"
      name="return_estate_wide"
@@ -193,22 +195,24 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Return"
      layout="topleft"
-     left="30"
+     left="20"
      name="return_btn"
      top="263"
      width="80" />
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Get Top Colliders..."
      layout="topleft"
      left="10"
      name="top_colliders_btn"
      tool_tip="List of objects experiencing the most potential collisions"
      top="313"
-     width="150" />
+     width="130" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -222,13 +226,14 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Get Top Scripts..."
      layout="topleft"
      left="10"
      name="top_scripts_btn"
      tool_tip="List of objects spending the most time running scripts"
      top_pad="5"
-     width="150" />
+     width="130" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -242,13 +247,14 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Restart Region"
      layout="topleft"
      left="10"
      name="restart_btn"
      tool_tip="Give 2 minute countdown and restart region"
      top_pad="5"
-     width="130" />
+     width="110" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -262,11 +268,12 @@
     <button
      follows="left|top"
      height="20"
+     font="SansSerifSmall"
      label="Delay Restart"
      layout="topleft"
      left="10"
      name="cancel_restart_btn"
      tool_tip="Delay region restart by one hour"
      top_pad="5"
-     width="130" />
+     width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 95e1456c6e..1dafd50cdb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="950"
  label="Estate"
  layout="topleft"
  left="0"
  name="Estate"
  top="320"
- width="480">
+ width="280">
     <panel.string
      name="email_unsupported">
         Feature unsupported
@@ -287,16 +287,15 @@ regions in the estate.
      name="kick_user_from_estate_btn"
      top_pad="5"
      width="250" />
-
     <text
      type="string"
      length="1"
-     bottom="34"
+     top="490"
      follows="left|top"
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="470"
+     left="8"
      width="200">
         Estate Managers:
     </text>
@@ -306,7 +305,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="estate_manager_help"
      top_delta="-1"
      width="18" />
@@ -315,9 +314,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -326,23 +325,23 @@ regions in the estate.
      multi_select="true"
      name="estate_manager_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_estate_manager_btn"
-     right="470"
+     left="8"
+     name="add_estate_manager_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_estate_manager_btn"
+     name="remove_estate_manager_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -351,7 +350,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="allow_resident_label"
      top_pad="5"
      width="200">
@@ -363,7 +362,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="allow_resident_help"
      top_delta="-1"
      width="18" />
@@ -372,9 +371,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -383,23 +382,23 @@ regions in the estate.
      multi_select="true"
      name="allowed_avatar_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_allowed_avatar_btn"
-     right="470"
+     left="8"
+     name="add_allowed_avatar_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_allowed_avatar_btn"
+     name="remove_allowed_avatar_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -408,7 +407,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="allow_group_label"
      top_pad="5"
      width="200">
@@ -420,7 +419,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="allow_group_help"
      top_delta="-1"
      width="18" />
@@ -429,9 +428,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -440,23 +439,23 @@ regions in the estate.
      multi_select="true"
      name="allowed_group_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_allowed_group_btn"
-     right="470"
+     left="8"
+     name="add_allowed_group_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_allowed_group_btn"
+     name="remove_allowed_group_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
     <text
@@ -465,7 +464,7 @@ regions in the estate.
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="ban_resident_label"
      top_pad="5"
      width="200">
@@ -477,7 +476,7 @@ regions in the estate.
      height="18"
      label="?"
      layout="topleft"
-     left_delta="182"
+     left_delta="232"
      name="ban_resident_help"
      top_delta="-1"
      width="18" />
@@ -486,9 +485,9 @@ regions in the estate.
      follows="top|left"
      height="60"
      layout="topleft"
-     right="470"
+     left="8"
      top_pad="5"
-     width="200" />
+     width="250" />
     <name_list
      follows="left|top"
      height="60"
@@ -497,23 +496,23 @@ regions in the estate.
      multi_select="true"
      name="banned_avatar_name_list"
      top_delta="0"
-     width="200" />
+     width="250" />
     <button
      follows="left|top"
      height="20"
-     label="Remove..."
+     label="Add..."
      layout="topleft"
-     name="remove_banned_avatar_btn"
-     right="470"
+     left="8"
+     name="add_banned_avatar_btn"
      top_pad="5"
      width="90" />
     <button
      follows="left|top"
      height="20"
-     label="Add..."
+     label="Remove..."
      layout="topleft"
-     left_delta="-110"
-     name="add_banned_avatar_btn"
+     name="remove_banned_avatar_btn"
+     left_pad="70"
      top_delta="0"
      width="90" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 661cb97c66..90cc209a68 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="360"
  label="Region"
  layout="topleft"
  left="0"
  name="General"
- top="320"
- width="480">
+ top="360"
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <text
@@ -290,7 +290,7 @@
         <combo_box.item
          label="PG"
          value="13" />
-    </combo_box>
+    </combo_box> 
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -311,7 +311,7 @@
      name="apply_btn"
      top="320"
      width="100" />
-    <button
+   <button
      follows="left|top"
      height="20"
      label="Teleport Home One User..."
@@ -343,8 +343,8 @@
      height="20"
      label="Manage Telehub..."
      layout="topleft"
-     left="250"
+     left_delta="0"
      name="manage_telehub_btn"
-     top="70"
-     width="150" />
+     top_pad="20"
+     width="150" /> 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index ae3b650774..bdf74c5621 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="340"
  label="Terrain"
  layout="topleft"
  left="0"
  name="Terrain"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <spinner
@@ -105,9 +105,9 @@
      height="20"
      label="Use Estate Sun"
      layout="topleft"
-     left="250"
+     left="15"
      name="use_estate_sun_check"
-     top="35"
+     top="105"
      width="100" />
     <button
      follows="left|top"
@@ -115,7 +115,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="70"
+     left_pad="85"
      name="use_estate_sun_help"
      top_delta="2"
      width="18" />
@@ -123,9 +123,9 @@
      height="20"
      label="Fixed Sun"
      layout="topleft"
-     left="250"
+     left="15"
      name="fixed_sun_check"
-     top="55"
+     top_pad="0"
      width="100" />
     <button
      follows="left|top"
@@ -133,7 +133,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="70"
+     left_pad="85"
      name="fixed_sun_help"
      top_delta="2"
      width="18" />
@@ -141,9 +141,9 @@
      height="20"
      image_name="icon_day_cycle.tga"
      layout="topleft"
-     left="285"
+     left="50"
      name="daycycle"
-     top="80"
+     top_delta="25"
      width="165" />
     <slider
      follows="left|top"
@@ -151,12 +151,12 @@
      increment="0.001"
      label="Phase"
      layout="topleft"
-     left="250"
+     left="15"
      max_val="30"
      min_val="6"
      name="sun_hour_slider"
      show_text="false"
-     top="105"
+     top_delta="30"
      width="200" />
     <button
      enabled="false"
@@ -164,18 +164,18 @@
      height="20"
      label="Apply"
      layout="topleft"
-     left="350"
+     left="130"
      name="apply_btn"
-     top="135"
+     top_delta="30"
      width="90" />
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="130"
+     height="210"
      layout="topleft"
      left="8"
      top="30"
-     width="460" />
+     width="240" />
     <button
      follows="left|top"
      height="20"
@@ -184,7 +184,7 @@
      left_delta="2"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="60"
+     top_pad="15"
      width="170" />
     <button
      follows="left|top"
@@ -204,7 +204,7 @@
      left="10"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="243"
+     top_pad="0"
      width="170" />
     <button
      follows="left|top"
@@ -224,7 +224,7 @@
      left="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top="283"
+     top_pad="15"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index f24630f4e3..bf63bb0cb6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="575"
  label="Ground Textures"
  layout="topleft"
  left="0"
  name="Textures"
  top="320"
- width="480">
+ width="280">
     <text
      type="string"
      length="1"
@@ -32,7 +32,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="400">
+     width="200">
         unknown
     </text>
     <text
@@ -45,7 +45,8 @@
      name="detail_texture_text"
      top="36"
      width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
+        Terrain Textures
+(requires 512x512, 24 bit .tga files)
     </text>
     <texture_picker
      follows="left|top"
@@ -53,7 +54,7 @@
      layout="topleft"
      left_delta="0"
      name="texture_detail_0"
-     top_delta="20"
+     top_delta="30"
      width="100" />
     <texture_picker
      follows="left|top"
@@ -67,9 +68,9 @@
      follows="left|top"
      height="100"
      layout="topleft"
-     left_pad="10"
+     left="10"
      name="texture_detail_2"
-     top_delta="0"
+     top_delta="105"
      width="100" />
     <texture_picker
      follows="left|top"
@@ -87,7 +88,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl"
-     top="146"
+     top="157"
      width="65">
         1 (Low)
     </text>
@@ -109,9 +110,9 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left="10"
      name="height_text_lbl3"
-     top_delta="0"
+     top_delta="105"
      width="100">
         3
     </text>
@@ -135,7 +136,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl5"
-     top="186"
+     top_delta="25"
      width="300">
         Texture Elevation Ranges
     </text>
@@ -147,7 +148,7 @@
      layout="topleft"
      left="51"
      name="height_text_lbl6"
-     top="201"
+     top_delta="20"
      width="100">
         Southwest
     </text>
@@ -163,31 +164,7 @@
      width="100">
         Northwest
     </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl8"
-     top_delta="0"
-     width="100">
-        Southeast
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl9"
-     top_delta="0"
-     width="100">
-        Northeast
-    </text>
-    <spinner
+   <spinner
      follows="left|top"
      height="20"
      increment="0.5"
@@ -198,7 +175,7 @@
      max_val="500"
      min_val="-500"
      name="height_start_spin_0"
-     top="221"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
@@ -217,52 +194,76 @@
      follows="left|top"
      height="20"
      increment="0.5"
-     label="Low"
+     label="High"
      label_width="37"
      layout="topleft"
-     left_pad="10"
+     left="10"
      max_val="500"
      min_val="-500"
-     name="height_start_spin_2"
-     top_delta="0"
+     name="height_range_spin_0"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="Low"
+     label="High"
      label_width="37"
      layout="topleft"
      left_pad="10"
      max_val="500"
      min_val="-500"
-     name="height_start_spin_3"
+     name="height_range_spin_1"
      top_delta="0"
      width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl8"
+     top_delta="30"
+     width="100">
+        Southeast
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Northeast
+    </text>
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="High"
+     label="Low"
      label_width="37"
      layout="topleft"
      left="10"
      max_val="500"
      min_val="-500"
-     name="height_range_spin_0"
-     top="241"
+     name="height_start_spin_2"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
      height="20"
      increment="0.5"
-     label="High"
+     label="Low"
      label_width="37"
      layout="topleft"
      left_pad="10"
      max_val="500"
      min_val="-500"
-     name="height_range_spin_1"
+     name="height_start_spin_3"
      top_delta="0"
      width="100" />
     <spinner
@@ -272,11 +273,11 @@
      label="High"
      label_width="37"
      layout="topleft"
-     left_pad="10"
+     left="10"
      max_val="500"
      min_val="-500"
      name="height_range_spin_2"
-     top_delta="0"
+     top_delta="20"
      width="100" />
     <spinner
      follows="left|top"
@@ -297,11 +298,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="25"
+     left="10"
      name="height_text_lbl10"
-     top="281"
-     width="480">
-        These values represent the blend range for the textures above.
+     top_delta="30"
+     width="270">
+        These values represent the blend range
+for the textures above.
     </text>
     <text
      type="string"
@@ -311,30 +313,22 @@
      layout="topleft"
      left_delta="0"
      name="height_text_lbl11"
-     top_delta="16"
-     width="450">
-        Measured in meters, the LOW value is the MAXIMUM height of Texture #1,
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="height_text_lbl12"
-     top_delta="16"
-     width="480">
-        and the HIGH value is the MINIMUM height of Texture #4.
+     top_delta="32"
+     width="270">
+         Measured in meters, the LOW value
+is the MAXIMUM height of Texture #1,
+and the HIGH value is the MINIMUM
+height of Texture #4.
     </text>
+    
     <button
      enabled="false"
      follows="left|bottom"
      height="20"
      label="Apply"
      layout="topleft"
-     left="350"
+     left="120"
      name="apply_btn"
-     top="290"
-     width="100" />
+     top_delta="60"
+     width="100" /> 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 2805ace906..21ecd01839 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -49,10 +49,10 @@
     <button
      enabled="false"
      height="132"
-     image_disabled="square_btn_32x128.tga"
-     image_disabled_selected="square_btn_selected_32x128.tga"
-     image_selected="square_btn_selected_32x128.tga"
-     image_unselected="square_btn_32x128.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled_Selected"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
      layout="topleft"
      left="2"
      name="less"
@@ -63,10 +63,10 @@
     <button
      enabled="false"
      height="132"
-     image_disabled="square_btn_32x128.tga"
-     image_disabled_selected="square_btn_selected_32x128.tga"
-     image_selected="square_btn_selected_32x128.tga"
-     image_unselected="square_btn_32x128.tga"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled_Selected"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
      layout="topleft"
      left_pad="2"
      name="more"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index ce8cb97f56..5ede1c2e9e 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -90,6 +90,576 @@
         border="true"
       />
     </collapsible_ctrl>
+  </sidetray_tab>
+  
+  <!--
+  <sidetray_tab 
+    name="sidebar_group"
+    mouse_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Groups"
+    description="Manage Groups."
+  >
+    <collapsible_ctrl 
+      name="group_accordion" 
+      title="Group General"
+      expanded="true"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_general" 
+        name="panel_group_general" 
+        filename="panel_group_general.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="groupland_accordion" 
+      title="Group Land and Money"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_land" 
+        name="panel_group_land" 
+        filename="panel_group_land_money.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="groupnotices_accordion" 
+      title="Group Notices"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_roles" 
+        name="panel_group_roles" 
+        filename="panel_group_roles.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="grouproles_accordion" 
+      title="Group Roles"
+      expanded="false"
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_group_roles" 
+        name="panel_group_roles" 
+        filename="panel_group_roles.xml" 
+        label="Group" 
+        border="true"
+      />
+    </collapsible_ctrl>
   </sidetray_tab>  
+  
+
+ <sidetray_tab 	
+    name="sidebar_previews" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Previews"
+    description="Previews."
+  >
+    <collapsible_ctrl 
+      name="floater_preview_animation" 
+      title="Preview Animation" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_animation" 
+        name="floater_preview_animation" 
+        filename="floater_preview_animation.xml" 
+        width="280" 
+        height="85" 
+        label="Preview_Animation" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_gesture" 
+      title="Preview Gesture" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_gesture" 
+        name="floater_preview_gesture" 
+        filename="floater_preview_gesture.xml" 
+        width="280" 
+        height="400" 
+        label="Preview_Gesture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_existing_landmark" 
+      title="Preview Existing Landmark" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_existing_landmark" 
+        name="floater_preview_existing_landmark" 
+        filename="floater_preview_existing_landmark.xml" 
+        width="280" 
+        height="495" 
+        label="Preview_Existing_Landmark" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_sound" 
+      title="Preview Sound" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_sound" 
+        name="floater_preview_sound" 
+        filename="floater_preview_sound.xml" 
+        width="280" 
+        height="85" 
+        label="Preview_Sound" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_preview_url" 
+      title="Preview URL" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_preview_url" 
+        name="floater_preview_url" 
+        filename="floater_preview_url.xml" 
+        width="280" 
+        height="465" 
+        label="Preview_URL" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_URL_entry" 
+      title="URL Entry" 
+      collapsable="true"
+      expanded="false"
+      min_width="200" 
+      min_height="200" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_URL_entry" 
+        name="floater_URL_entry" 
+        filename="floater_URL_entry.xml" 
+        width="280" 
+        height="87" 
+        label="URL_entry" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  </sidetray_tab>
+
+  <sidetray_tab 	
+    name="sidebar_region" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Region"
+    description="Region."
+  >
+    <collapsible_ctrl 
+      name="panel_region_covenant" 
+      title="Region Covenant" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_covenant" 
+        name="panel_region_covenant" 
+        filename="panel_region_covenant.xml" 
+        width="280" 
+        height="350" 
+        label="Panel_Region_Covenant" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="panel_region_debug" 
+      title="Region Debug" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_debug" 
+        name="panel_region_debug" 
+        filename="panel_region_debug.xml" 
+        width="280" 
+        height="500" 
+        label="Panel_Region_Debug" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_estate" 
+      title="Region Estate" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_estate" 
+        name="panel_region_estate" 
+        filename="panel_region_estate.xml" 
+        width="280" 
+        height="950" 
+        label="Panel_Region_Estate" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_general" 
+      title="Region General" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_general" 
+        name="panel_region_general" 
+        filename="panel_region_general.xml" 
+        width="280" 
+        height="500" 
+        label="Panel_Region_General" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_terrain" 
+      title="Region Terrain" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_terrain" 
+        name="panel_region_terrain" 
+        filename="panel_region_terrain.xml" 
+        width="280" 
+        height="340" 
+        label="Panel_Region_Terrain" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="panel_region_texture" 
+      title="Region Texture" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="panel_region_texture" 
+        name="panel_region_texture" 
+        filename="panel_region_texture.xml" 
+        width="280" 
+        height="575" 
+        label="Panel_Region_Texture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  <collapsible_ctrl 
+      name="floater_region_info" 
+      title="Region Info" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_region_info" 
+        name="floater_region_info" 
+        filename="floater_region_info.xml" 
+        width="280" 
+        height="512" 
+        label="Floater_Region_Info" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+  </sidetray_tab>
+ 
+  <sidetray_tab 	
+    name="Build" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Build"
+    description="Build"
+  >
+    <collapsible_ctrl 
+      name="floater_tools" 
+      title="Tools" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_tools" 
+        name="floater_tools" 
+        filename="floater_tools.xml" 
+        width="280" 
+        height="550" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_bulk_perms" 
+      title="Bulk Perms" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_bulk_perms" 
+        name="floater_bulk_perms" 
+        filename="floater_bulk_perms.xml" 
+        width="280" 
+        height="360" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_build_options" 
+      title="Build Options" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_build_options" 
+        name="floater_build_options" 
+        filename="floater_build_options.xml" 
+        width="280" 
+        height="151" 
+        label="Tools" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+  </sidetray_tab>
+
+ <sidetray_tab 	
+    name="othertools" 
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+    image="icn_voice-groupfocus.tga"
+    tab_title="Other Tools"
+    description="Other Tools"
+  >
+    <collapsible_ctrl 
+      name="floater_gesture" 
+      title="Gestures" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_gesture" 
+        name="floater_gesture" 
+        filename="floater_gesture.xml" 
+        width="280" 
+        height="465" 
+        label="Gesture" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+    <collapsible_ctrl 
+      name="floater_buy_contents" 
+      title="Buy Contents" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_buy_contents" 
+        name="floater_buy_contents" 
+        filename="floater_buy_contents.xml" 
+        width="280" 
+        height="250" 
+        label="buy_contents" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_buy_object" 
+      title="Buy Object" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_buy_object" 
+        name="floater_buy_object" 
+        filename="floater_buy_object.xml" 
+        width="280" 
+        height="250" 
+        label="buy_object" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_inventory_view_finder" 
+      title="Inventory View Finder" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_inventory_view_finder" 
+        name="floater_inventory_view_finder" 
+        filename="floater_inventory_view_finder.xml" 
+        width="280" 
+        height="408" 
+        label="view_finder" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    <collapsible_ctrl 
+      name="floater_mute" 
+      title="Mute" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_mute" 
+        name="floater_mute" 
+        filename="floater_mute.xml" 
+        width="280" 
+        height="300" 
+        label="mute" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="floater_sell_land" 
+      title="Sell Land" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_sell_land" 
+        name="floater_sell_land" 
+        filename="floater_sell_land.xml" 
+        width="280" 
+        height="600" 
+        label="sell_land" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+     <collapsible_ctrl 
+      name="floater_telehub" 
+      title="Telehub" 
+      collapsable="true" 
+      min_width="200" 
+      min_height="200" 
+      expanded="false" 
+      header_visible="true"
+    >
+      <panel 
+        class="floater_telehub" 
+        name="floater_telehub" 
+        filename="floater_telehub.xml" 
+        width="280" 
+        height="250" 
+        label="telehub" 
+        border="true" 
+      />
+    </collapsible_ctrl>
+    
+  </sidetray_tab>
+ --> 
 </side_tray>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 58bb16581a..c21c691680 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -152,7 +152,7 @@
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
 	<string name="AvatarBusy">Busy</string>
-	<string name="AvatarMuted">Muted</string>
+	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
 	<string name="anim_express_afraid">Afraid</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index a1e074fae2..3e7e07749a 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<button image_unselected="button_enabled_32x128.tga"
-        image_selected="button_enabled_selected_32x128.tga"
-        image_disabled_selected="button_disabled_32x128.tga"
-        image_disabled="button_disabled_32x128.tga"
+<button image_unselected="PushButton_Off"
+        image_selected="PushButton_Selected"
+        image_disabled_selected="PushButton_Selected_Disabled"
+        image_disabled="PushButton_Disabled"
         label_color="ButtonLabelColor"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index ff01dcebd8..97060fb161 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -3,16 +3,15 @@
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
            follows="left|top">
-  <check_box.label_text name="checkbox label"/>
+  <check_box.label_text name="checkbox label" />
   <check_box.check_button name="CheckboxCtrl Button"
-                          commit_on_return="false" 
+                          commit_on_return="false"
                           label=""
                           is_toggle="true"
-                          hover_glow_amount="0.35"
                           font="SansSerif"
                           scale_image="false"
-                          image_unselected="checkbox_enabled_false.tga"
-                          image_selected="checkbox_enabled_true.tga"
-                          image_disabled="checkbox_disabled_false.tga"
-                          image_disabled_selected="checkbox_disabled_true.tga"/>
+                          image_unselected="Checkbox_Off"
+                          image_selected="Checkbox_On"
+                          image_disabled="Checkbox_Off_Disabled"
+                          image_disabled_selected="Checkbox_On_Disabled" />
 </check_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index 304eda2d97..178c890c61 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -5,6 +5,4 @@
   <color_swatch.caption_text name="caption"
                              font="SansSerifSmall"
                              follows="left|right|bottom"/>
-  <color_swatch.border name="border"
-                       bevel_type="in"/>
 </color_swatch>
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 8a8f3f7f2c..45b1e1eb9f 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <combo_box font="SansSerifSmall"
-           arrow_image="combobox_arrow.tga" 
-           list_position="below" 
-           max_chars="20" 
-           follows="left|top">
+           list_position="below"
+           max_chars="20"
+           follows="right|top">
   <combo_box.combo_button name="Combobox Button"
+                          label=""
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
-                          halign="left" 
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <combo_box.combo_list bg_writeable_color="white"/>
+                          image_unselected="ComboButton_Off"
+                          image_selected="ComboButton_Selected"
+                          image_disabled="ComboButton_Disabled"
+                          image_disabled_selected="ComboButton_Disabled_Selected" />
+  <combo_box.drop_down_button name="Drop Down Button"
+                              label=""
+                              hover_glow_amount="0.15"
+                              font="SansSerifSmall"
+                              scale_image="true"
+                              pad_right="24"
+                              image_unselected="DropDown_Off"
+                              image_selected="DropDown_Selected"
+                              image_disabled="DropDown_Disabled"
+                              image_disabled_selected="DropDown_Disabled_Selected" />
+  <combo_box.combo_list bg_writeable_color="white" />
   <combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
-                          font="SansSerifSmall"/>
+                          font="SansSerifSmall" />
 </combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index c35d15ec92..602250ace6 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -2,19 +2,19 @@
 <drop_down text_enabled_color="LabelTextColor"
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
-           allow_text_entry="false" 
+           allow_text_entry="false"
            follows="left|top">
   <drop_down.combo_button name="Combobox Button"
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
                           halign="left"
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <drop_down.combo_list bg_writeable_color="white"/>
-  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true"/>
+                          image_unselected="PushButton_Off"
+                          image_selected="PushButton_Selected"
+                          image_disabled="PushButton_Disabled"
+                          image_disabled_selected="PushButton_Disabled_Selected"
+                          image_overlay="Combobox_Over"
+                          image_overlay_alignment="right" />
+  <drop_down.combo_list bg_writeable_color="white" />
+  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true" />
 </drop_down>
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index e0033058c8..a5043c5c14 100644
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <flyout_button list_position="below">
   <action_button scale_image="true"
-                image_selected="flyout_btn_left_selected.tga"
-                image_unselected="flyout_btn_left.tga"
-                image_disabled="flyout_btn_left_disabled.tga"/>
-  <combo_button image_selected="flyout_btn_right_selected.tga"
-                image_unselected="flyout_btn_right.tga"
-                image_disabled="flyout_btn_right_disabled.tga"
+                image_selected="SegmentedBtn_Left_Selected"
+                image_unselected="SegmentedBtn_Left_Off"
+                image_disabled="SegmentedBtn_Left_Disabled"/>
+  <combo_button image_selected="ComboButton_Selected"
+                image_unselected="ComboButton_Off"
+                image_disabled="ComboButton_Disabled"
                 pad_right="6"
                 tab_stop="false"/>
-</flyout_button>
-
+</flyout_button>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 11081ae308..3ab9379705 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -14,5 +14,4 @@
              mouse_opaque="true"
              name="line_editor"
              font="SansSerifSmall">
-  <line_editor.border bevel_style="in"/>
 </line_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 32f5a18d1c..07980a9d09 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,64 +3,50 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
+
+
+
 <location_input font="SansSerifSmall"
-           add_landmark_image_enabled="icon_event_adult.tga"
-           add_landmark_image_disabled="icon_event.tga"
-           add_landmark_hpad="4"
-           allow_text_entry="true"
-           arrow_image="combobox_arrow.tga"
-           list_position="below"
-           show_text_as_tentative="false"
-           max_chars="20"
-           follows="left|top">
-  <location_input.background name="Background"
-                          visible="true"
-                          label=""
-                          follows="left|top|right"
-                          image_unselected="navbar_bg_center.tga"
-                          image_selected="navbar_bg_center.tga"
-                          image_disabled="navbar_bg_center.tga"
-                          image_disabled_selected="navbar_bg_center.tga"
-                          image_hover_selected="navbar_bg_center.tga"
-                          image_hover_unselected="navbar_bg_center.tga" />
-  <location_input.info_button name="Place Information"
+                add_landmark_image_enabled="icon_event_adult.tga"
+                add_landmark_image_disabled="icon_event.tga"
+                add_landmark_width="20"
+                add_landmark_height="20"
+                add_landmark_hpad="2"
+                allow_text_entry="true"
+                arrow_image="Combobox_Selected"
+                list_position="below"
+      	        show_text_as_tentative="false"
+                max_chars="20"
+                follows="left|top"
+                background="TextField_Off">
+  <info_button name="Place Information"
                           label=""
                           tool_tip="About current location"
-                          width="20"
-                          height="20"
+                          width="16"
+                          height="16"
                           follows="left|top"
-                          image_overlay="map_infohub.tga"
-                          image_unselected="navbar_bg_left.tga"
-                          image_selected="navbar_bg_left.tga"
-                          image_hover_selected="navbar_bg_left.tga"
-                          image_hover_unselected="navbar_bg_left.tga"
-                          image_disabled_selected="navbar_bg_left.tga"
-                          image_disabled="navbar_bg_left.tga" />
-  <location_input.add_landmark_button name="Add Landmark"
+                          hover_glow_amount="0.15"
+                          image_unselected="Info_Off"
+                          image_selected="Info_Off"
+                          image_disabled_selected="Info_Off"
+                          image_disabled="Info_Off" />
+  <add_landmark_button name="Add Landmark"
                           label=""
                           width="16"
                           height="16"
                           tool_tip="Add to My Landmarks"
                           follows="right|top"
                           scale_image="false" />
-  <location_input.combo_button name="Location History"
+  <combo_button name="Location History"
                           label=""
-                          tool_tip="My Location History"
-                          width="20"
-                          height="20"
-                          image_overlay="navbar_history.tga"
-                          image_overlay_alignment="center"
-                          image_unselected="navbar_bg_right.tga"
-                          image_selected="navbar_bg_right.tga"
-                          image_disabled="navbar_bg_right.tga"
-                          image_disabled_selected="navbar_bg_right.tga"
-                          image_hover_selected="navbar_bg_right.tga"
-                          image_hover_unselected="navbar_bg_right.tga" />
-  <location_input.combo_list bg_writeable_color="white"/>
-  <location_input.combo_editor name="Combo Text Entry"
-                          select_on_focus="true"
-                          font="SansSerifSmall"
-                          bevel_style="none"
-                          border_style="line"
-                          border_thickness="0" />
+                          pad_right="0"
+                          tool_tip="My Location History"/>
+  <combo_list bg_writeable_color="white"/>
+  <combo_editor name="Combo Text Entry"
+                text_pad_left="20"
+                select_on_focus="true"
+                font="SansSerifSmall"
+                bevel_style="none"
+                border_style="line"
+                border.border_thickness="0"/>
 </location_input>
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
index 3344de06b0..39cd464872 100644
--- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<progress_bar image_bar="rounded_square.tga"
-              image_fill="progressbar_fill.tga"
+<progress_bar image_bar="ProgressTrack"
+              image_fill="ProgressBar"
               image_shadow="rounded_square_soft.tga"
               color_bar.red="0.5764"
               color_bar.green="0.6627"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index 2d851042a5..ad7ef5bffc 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_group draw_border="true"
+<radio_group draw_border="false"
              name="radio_group"
-             mouse_opaque="true"
+             mouse_opaque="false"
              follows="left|top"
              font="SansSerifSmall"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 0a27ca509b..281a55d5e2 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -2,8 +2,9 @@
 <radio_item follows="left|top">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
-                          image_unselected="radio_active_false.tga"
-                          image_selected="radio_active_true.tga"
-                          image_disabled="radio_inactive_false.tga"
-                          image_disabled_selected="radio_inactive_true.tga"/>
+                          image_unselected="RadioButton_Off"
+                          image_selected="RadioButton_On"
+                          image_disabled="RadioButton_Disabled"
+                          image_disabled_selected="RadioButton_On_Disabled"/>
 </radio_item>
+
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index a6c9a56dfd..3b195c6b33 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_bar thumb_image="rounded_square.tga"
-            track_image="rounded_square.tga"
-            track_color="ScrollbarTrackColor"
+<scroll_bar thumb_image="ScrollThumb_Vert"
+            track_image="ScrollTrack_Vert"
+	    track_color="ScrollbarTrackColor"
             thumb_color="ScrollbarThumbColor"
-            thickness="16">
-  <up_button image_unselected="scrollbutton_up_out_blue.tga"
-             image_selected="scrollbutton_up_in_blue.tga"
-             scale_image="true"/>
-  <down_button image_unselected="scrollbutton_down_out_blue.tga"
-               image_selected="scrollbutton_down_in_blue.tga"
-               scale_image="true"/>
-  <left_button image_unselected="scrollbutton_left_out_blue.tga"
-               image_selected="scrollbutton_left_in_blue.tga"
-               scale_image="true"/>
-  <right_button image_unselected="scrollbutton_right_out_blue.tga"
-               image_selected="scrollbutton_right_in_blue.tga"
-               scale_image="true"/>
+            thickness="15">
+  <up_button image_unselected="ScrollArrow_Up"
+             image_selected="ScrollArrow_Up"
+             scale_image="true" thickness="15"
+             hover_glow_amount="0.15"/>
+  <down_button image_unselected="ScrollArrow_Down"
+               image_selected="ScrollArrow_Down"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <left_button image_unselected="ScrollArrow_Left"
+               image_selected="ScrollArrow_Left"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <right_button image_unselected="ScrollArrow_Right"
+               image_selected="ScrollArrow_Right"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
 </scroll_bar>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 10080e5e39..67588d76ca 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_editor select_on_focus="true">
-  <clear_search_button image_unselected="icn_clear_lineeditor.tga"
-                       image_selected="close_inactive_blue.tga"
+  <clear_search_button image_unselected="TextField_Search_Off"
+                       image_selected="TextField_Search_Active"
+                       image_disabled="TextField_Search_Disabled"
                        image_color="TextFgTentativeColor"/>
 </search_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 55ec18f292..8b4a5afbe9 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
-        tab_btn_image_selected="sidebar_tab_left_selected.tga"
-		tab_btn_width = "32"
-		tab_btn_height = "32"
-		tab_btn_margin = "0"
+<side_tray tab_btn_image="TaskPanel_Tab_Off"
+        tab_btn_image_selected="TaskPanel_Tab_Selected"
+		tab_btn_width="32"
+		tab_btn_height="40"
+		tab_btn_margin="1"
         >
 </side_tray>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 20af3bb58f..b39c2991a0 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -6,6 +6,6 @@
                     bg_readonly_color="TextBgReadOnlyColor"
                     bg_writeable_color="TextBgWriteableColor"
                     bg_focus_color="TextBgFocusColor"
-                    hide_border="false" 
-                    hide_scrollbar="false" 
+                    hide_border="true"
+                    hide_scrollbar="false"
                     font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index ba9ad21cc0..7004de8475 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -2,6 +2,7 @@
 <slider_bar track_color="SliderTrackColor"
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
-            thumb_image="icn_slide-thumb_dark.tga"
-            track_image="icn_slide-groove_dark.tga"
-            track_highlight_image="icn_slide-highlight.tga"/>
+            thumb_image="SliderThumb_Off"
+            hover_glow_amount="0.15"
+            track_image="SliderTrack_Horiz"
+            track_highlight_image="SliderTrack_Horiz" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 8245e5ff23..7aad55fb37 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <tab_container tab_min_width="60"
                tab_max_width="150"
-               tab_top_image_unselected="tab_top_blue.tga"
-               tab_top_image_selected="tab_top_selected_blue.tga"
+               tab_top_image_unselected="TabTop_Middle_Off"
+               tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="tab_bottom_blue.tga"
                tab_bottom_image_selected="tab_bottom_selected_blue.tga"
-               tab_left_image_unselected="tab_left.tga"
-               tab_left_image_selected="tab_left_selected.tga"/>
\ No newline at end of file
+               tab_left_image_unselected="TabTop_Left_Off"
+               tab_left_image_selected="TabTop_Left_Selected"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index dc4c430546..a613c43f90 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -15,5 +15,5 @@
              name="line_editor"
              font="SansSerifSmall">
   <line_editor.border bevel_style="in"
-                      follows="all"/>
+                      follows="all" />
 </line_editor>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 2838ff6335..5dc8efba4a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -77,6 +77,10 @@ class ViewerManifest(LLManifest):
                 self.path("paths.xml")
                 # include the entire textures directory recursively
                 if self.prefix(src="*/textures"):
+                        self.path("*/*.tga")
+                        self.path("*/*.j2c")
+                        self.path("*/*.jpg")
+                        self.path("*/*.png")
                         self.path("*.tga")
                         self.path("*.j2c")
                         self.path("*.jpg")
diff --git a/install.xml b/install.xml
index 1b3c34737c..77279c57c1 100644
--- a/install.xml
+++ b/install.xml
@@ -435,9 +435,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>eeffb03bd6672b6e7751448e5306d874</string>
+            <string>978ad7c67fe4a2419bfc841e2956ff9f</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20081201.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>