diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b3c9829f6..11a7afb9a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -213,6 +213,17 @@
 		<key>Value</key>
 		<string>mapto</string>
 	</map>
+	<key>AscentCmdLineMapToKeepPos</key>
+	<map>
+		<key>Comment</key>
+		<string>Attempt to arrive in the same location you were at.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
 	<key>AscentCmdLineDrawDistance</key>
 	<map>
 	<key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index ee9cf2dd6..03e2bcc03 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -14,6 +14,44 @@
 	 </array>
 	</map>
 	<!-- Ascent Account-Specific (If active) -->
+	<key>AscentUseCustomTag</key>
+	<map>
+		<key>Comment</key>
+		<string>Show a custom local tag.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
+	<key>AscentCustomTagColor</key>
+    <map>
+      <key>Comment</key>
+      <string>Color of custom local tag.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.5</real>
+        <real>1.0</real>
+        <real>0.25</real>
+        <real>1.0</real>
+      </array>
+    </map>
+	<key>AscentCustomTagLabel</key>
+	<map>
+		<key>Comment</key>
+		<string>Label for the custom local tag</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>String</string>
+		<key>Value</key>
+		<string>Custom</string>
+	</map>
 	<key>AscentSpoofClientIndex</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 3b20ce398..ae2b60d70 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -82,20 +82,7 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
 	childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
 	childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
 
-	if (gSavedSettings.getBOOL("AscentUseCustomTag"))
-	{
-		childEnable("custom_tag_label_text");
-		childEnable("custom_tag_label_box");
-		childEnable("custom_tag_color_text");
-		childEnable("custom_tag_color_swatch");
-	}
-	else
-	{
-		childDisable("custom_tag_label_text");
-		childDisable("custom_tag_label_box");
-		childDisable("custom_tag_color_text");
-		childDisable("custom_tag_color_swatch");
-	}
+	
 	refresh();
 	
 }
@@ -144,12 +131,46 @@ void LLPrefsAscentVanImpl::refreshValues()
 	{
 		mSelectedClient			= gSavedSettings.getU32("AscentSpoofClientIndex");
 		mEffectColor			= gSavedSettings.getColor4("EffectColor");
+		if (gSavedSettings.getBOOL("AscentUseCustomTag"))
+		{
+			childEnable("custom_tag_label_text");
+			childEnable("custom_tag_label_box");
+			childEnable("custom_tag_color_text");
+			childEnable("custom_tag_color_swatch");
+		}
+		else
+		{
+			childDisable("custom_tag_label_text");
+			childDisable("custom_tag_label_box");
+			childDisable("custom_tag_color_text");
+			childDisable("custom_tag_color_swatch");
+		}
+		mCustomTagLabel			= gSavedSettings.getString("AscentCustomTagLabel");
+		mCustomTagColor			= gSavedSettings.getColor4("AscentCustomTagColor");
 	}
 	else
 	{
 		mSelectedClient			= gSavedPerAccountSettings.getU32("AscentSpoofClientIndex");
 		mEffectColor			= gSavedPerAccountSettings.getColor4("EffectColor");
+		if (gSavedPerAccountSettings.getBOOL("AscentUseCustomTag"))
+		{
+			childEnable("custom_tag_label_text");
+			childEnable("custom_tag_label_box");
+			childEnable("custom_tag_color_text");
+			childEnable("custom_tag_color_swatch");
+		}
+		else
+		{
+			childDisable("custom_tag_label_text");
+			childDisable("custom_tag_label_box");
+			childDisable("custom_tag_color_text");
+			childDisable("custom_tag_color_swatch");
+		}
+		mCustomTagLabel			= gSavedPerAccountSettings.getString("AscentCustomTagLabel");
+		mCustomTagColor			= gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
 	}
+	
+	
 }
 
 void LLPrefsAscentVanImpl::refresh()
@@ -179,10 +200,6 @@ void LLPrefsAscentVanImpl::refresh()
 		gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
 	}
-	
-	
-	
-
 }
 
 void LLPrefsAscentVanImpl::cancel()
@@ -230,12 +247,18 @@ void LLPrefsAscentVanImpl::apply()
 	if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
 	{
 		llinfos << "Storing color in client" << llendl;
-		gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
+		gSavedSettings.setColor4("EffectColor",				childGetValue("effect_color_swatch"));
+		gSavedSettings.setBOOL("AscentUseCustomTag",		childGetValue("customize_own_tag_check"));
+		gSavedSettings.setString("AscentCustomTagLabel",		childGetValue("custom_tag_label_box"));
+		gSavedSettings.setColor4("AscentCustomTagColor",	childGetValue("custom_tag_color_swatch"));
 	}
 	else
 	{
 		llinfos << "Storing color in account" << llendl;
-		gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
+		gSavedPerAccountSettings.setColor4("EffectColor",			childGetValue("effect_color_swatch"));
+		gSavedPerAccountSettings.setBOOL("AscentUseCustomTag",		childGetValue("customize_own_tag_check"));
+		gSavedPerAccountSettings.setString("AscentCustomTagLabel",	childGetValue("custom_tag_label_box"));
+		gSavedPerAccountSettings.setColor4("AscentCustomTagColor",	childGetValue("custom_tag_color_swatch"));
 	}
 
 	
diff --git a/indra/newview/llpanelskins.cpp b/indra/newview/llpanelskins.cpp
index ad0ee6bec..324efa20d 100644
--- a/indra/newview/llpanelskins.cpp
+++ b/indra/newview/llpanelskins.cpp
@@ -91,7 +91,7 @@ void LLPanelSkins::refresh()
 		while(found) 
 		{
 			found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
-			llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl;
+			//llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl;
 			if(found)
 			{
 				LLSD data;
@@ -102,8 +102,8 @@ void LLPanelSkins::refresh()
 				{
 					datas.push_back(data);
 					comboBox->add(data["skin_name"].asString());
-					llinfos << "data is length " << datas.size() << " foldername field is "
-						<< data["folder_name"].asString() << " and looking for " << gSavedSettings.getString("SkinCurrent") <<llendl;
+					/*llinfos << "data is length " << datas.size() << " foldername field is "
+						<< data["folder_name"].asString() << " and looking for " << gSavedSettings.getString("SkinCurrent") <<llendl;*/
 					if(data["folder_name"].asString()==mSkin)
 					{
 						//llinfos << "found!!!!!!1!1" << llendl;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0694caf33..c1a5f92d6 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3357,6 +3357,12 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
 			color = gColors.getColor( "AvatarNameColor" );
 			return;
 		}
+		else if (gSavedSettings.getBOOL("AscentUseCustomTag"))
+		{
+			color = gSavedSettings.getColor4("AscentCustomTagColor");
+			client = gSavedSettings.getString("AscentCustomTagLabel");
+			return;
+		}
 		else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
 		{
 			uuid_str = gSavedSettings.getString("AscentSpoofClientUUID");
@@ -3405,7 +3411,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
 			&& getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6")
 			{
 				color = LLColor4(0.5f, 0.0f, 0.0f);
-				client = "Unknown";
+				client = "??";
 			}
 			return;
 		}
@@ -3448,7 +3454,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
 	}
 	
 	if (false)
-	//Probably should remove this entirely, but it's useful information if we're going to try for the new client tag idea. -HgB
+	//We'll remove this entirely eventually, but it's useful information if we're going to try for the new client tag idea. -HgB
 	//if(useComment) 
 	{
 		LLUUID baked_head_id = getTE(9)->getID();
@@ -5613,7 +5619,8 @@ void LLVOAvatar::processAnimationStateChanges()
 
 	stop_glerror();
 }
-//Here's that undeform function I was talking about. -HGB
+/*Here's that undeform function I was talking about. -HGB
+// Bug-fixed Linden Labs style. Comment out 4ever.
 std::string undeformers[] =
 {
 	"7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969",
@@ -5675,7 +5682,7 @@ void LLVOAvatar::undeform()
 	}
 
 	stop_glerror();
-}
+}*/
 
 
 
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 99d7e0b2a..6cb6d15aa 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -69,7 +69,7 @@
 		</menu_item_call>
 		<menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator4" width="243" />
-		<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
+		<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0" color="1 0 0 1"
 		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
 			<on_click function="File.Quit" userdata="" />
 		</menu_item_call>
@@ -387,11 +387,100 @@
 			<on_click function="View.HighlightTransparent" userdata="" />
 			<on_check function="View.CheckHighlightTransparent" />
 		</menu_item_check>
-    <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons" left="0"
-       mouse_opaque="true" name="beacons" width="211" shortcut="control|alt|shift|N">
-      <on_click function="ShowFloater" userdata="beacons" />
-      <on_check function="FloaterVisible" userdata="beacons" />
-    </menu_item_check>
+    <menu create_jump_keys="true" drop_shadow="true" enabled="true"
+		label="Beacons" mouse_opaque="false" name="Beacons"
+		opaque="true" tear_off="true">
+			<menu_item_check enabled="true" height="18"
+			label="Beacons Always On" mouse_opaque="true"
+			name="Beacons Always On" shortcut="control|n">
+				<on_click function="ToggleControl"
+				userdata="BeaconAlwaysOn" />
+				<on_check control="BeaconAlwaysOn" />
+			</menu_item_check>
+			<menu_item_separator enabled="true" height="8"
+			label="-----------" mouse_opaque="true" name="separator" />
+			<menu_item_check enabled="true" height="18"
+			label="Scripted Objects with Touch Only" left="0" color="1 0 0 1"
+			mouse_opaque="true" name="Scripted Objects With Touch Only">
+				<on_click function="View.ToggleBeacon"
+				userdata="scripttouchbeacon" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="scripttouchbeacon" />
+			</menu_item_check>
+			<menu_item_check enabled="true" height="18"
+			label="Scripted Objects" mouse_opaque="true" color="1 0 0 1"
+			name="Scripted Objects">
+				<on_click function="View.ToggleBeacon"
+				userdata="scriptsbeacon" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="scriptsbeacon" />
+			</menu_item_check>
+			<menu_item_check enabled="true" height="18"
+			label="Physical Objects" mouse_opaque="true" color="0 1 0 1"
+			name="Physical Objects">
+				<on_click function="View.ToggleBeacon"
+				userdata="physicalbeacon" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="physicalbeacon" />
+			</menu_item_check>
+			<menu_item_check enabled="true" height="18"
+			label="Sound Sources" mouse_opaque="true" color="1 1 0 1"
+			name="Sound Sources">
+				<on_click function="View.ToggleBeacon"
+				userdata="soundsbeacon" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="soundsbeacon" />
+			</menu_item_check>
+			<menu_item_check enabled="true" height="18"
+			label="Particle Sources" mouse_opaque="true" color="0 0 1 1"
+			name="Particle Sources">
+				<on_click function="View.ToggleBeacon"
+				userdata="particlesbeacon" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="particlesbeacon" />
+			</menu_item_check>
+			<menu_item_separator enabled="true" height="8"
+			label="-----------" mouse_opaque="true" name="separator" />
+			<menu_item_check enabled="true" height="18"
+			label="Render Highlights" mouse_opaque="true"
+			name="Render Highlights">
+				<on_click function="View.ToggleBeacon"
+				userdata="renderhighlights" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="renderhighlights" />
+			</menu_item_check>
+			<menu_item_check enabled="true" height="18"
+			label="Render Beacons" mouse_opaque="true"
+			name="Render Beacons">
+				<on_click function="View.ToggleBeacon"
+				userdata="renderbeacons" />
+				<on_check function="View.CheckBeaconEnabled"
+				userdata="renderbeacons" />
+			</menu_item_check>
+			<menu_item_separator enabled="true" height="8"
+			label="-----------" mouse_opaque="true" name="separator3" />
+			<menu create_jump_keys="true"
+			drop_shadow="true" enabled="true" height="117"
+			label="Beacon Width" mouse_opaque="false" name="Beacon Width"
+			opaque="true" tear_off="true">
+				<menu_item_call enabled="true" height="18" label="1"
+				mouse_opaque="true" name="Beacon Width 1">
+					<on_click function="View.BeaconWidth" userdata="1" />
+				</menu_item_call>
+				<menu_item_call enabled="true" height="18" label="4"
+				mouse_opaque="true" name="Beacon Width 4">
+					<on_click function="View.BeaconWidth" userdata="4" />
+				</menu_item_call>
+				<menu_item_call enabled="true" height="18" label="16"
+				mouse_opaque="true" name="Beacon Width 16">
+					<on_click function="View.BeaconWidth" userdata="16" />
+				</menu_item_call>
+				<menu_item_call enabled="true" height="18" label="32"
+				mouse_opaque="true" name="Beacon Width 32">
+					<on_click function="View.BeaconWidth" userdata="32" />
+				</menu_item_call>
+			</menu>
+		</menu>
     <menu_item_check bottom="-384" enabled="true" height="19" label="Hide Particles" left="0"
           mouse_opaque="true" name="Hide Particles" width="129" shortcut="control|alt|shift|=">
         <on_click function="View.ToggleRenderType" userdata="hideparticles" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 07a2b24b9..da2abed87 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -90,8 +90,8 @@
 				tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
 				mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
 				width="400" />
-			<check_box bottom_delta="65" control_name="AscentUseCustomTag" enabled="false"
-				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+			<check_box bottom_delta="65" control_name="AscentUseCustomTag" enabled="true"
+				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 				label="Use a custom color and label (Local only)" left_delta="230"
 				tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
 				mouse_opaque="true" name="customize_own_tag_check" radio_style="false"