diff --git a/lib/mac/UserInterface/CColorCaption.cp b/lib/mac/UserInterface/CColorCaption.cp
new file mode 100644
index 000000000000..70143532ffdf
--- /dev/null
+++ b/lib/mac/UserInterface/CColorCaption.cp
@@ -0,0 +1,152 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "CColorCaption.h"
+
+
+CChameleonCaption :: CChameleonCaption ( LStream* inStream )
+	: LGACaption(inStream)
+{
+	mTextColor.red = mTextColor.green = mTextColor.blue = 0;		// black
+	mBackColor.red = mBackColor.green = mBackColor.blue = 0xFFFF;	// white
+}
+
+
+//
+// SetColor
+//
+// Use given colors instead. First version sets both fg and bg, second version only
+// sets the fg color.
+//
+void
+CChameleonCaption :: SetColor ( RGBColor & inTextColor, RGBColor & inBackColor )
+{
+	mTextColor = inTextColor;
+	mBackColor = inBackColor;
+	
+} // SetColor
+
+
+void
+CChameleonCaption :: SetColor ( RGBColor & inTextColor )
+{
+	mTextColor = inTextColor;
+	
+} // SetColor
+
+
+//
+// DrawSelf
+//
+// Taken from LGACaption and modified to use our colors instead of those in
+// the text traits rsrc. Differences from the original are marked.
+//
+void
+CChameleonCaption :: DrawSelf()
+{
+	Rect	localFrame;
+	CalcLocalFrameRect ( localFrame );
+	
+	// ¥ Setup the text traits and get the justification
+	Int16	just = UTextTraits::SetPortTextTraits ( mTxtrID );
+	
+	// ¥ Get the fore and back colors applied
+	ApplyForeAndBackColors ();
+	RGBColor textColor = mTextColor;
+	
+	// NSCP -- Apply our own text colors, not those of the text traits rsrc
+	::RGBBackColor(&mBackColor);
+	
+	// ¥ Setup a device loop so that we can handle drawing at the correct bit depth
+	StDeviceLoop	theLoop ( localFrame );
+	Int16				depth;
+	while ( theLoop.NextDepth ( depth )) 
+	{		
+		// ¥ If we are drawing to a color screen then we are going to lighten
+		// the color of the text when we are disabled
+		if ( depth > 4 && !IsActive ())
+			textColor = UGraphicsUtilities::Lighten ( &textColor );
+	
+		// NSCP -- Set the foreground color to our own color
+		::RGBForeColor ( &textColor );
+		
+		// ¥ Now we can finally get the text drawn
+		UTextDrawing::DrawWithJustification ( (Ptr)&mText[1], mText[0], localFrame, just );	
+	}	
+	
+} // DrawSelf
+
+#pragma mark -
+
+CChameleonBroadcastCaption :: CChameleonBroadcastCaption ( LStream* inStream )
+	: CChameleonCaption(inStream)
+{
+	*inStream >> mMessage;
+	*inStream >> mRolloverTraits;
+	
+	mSavedTraits = GetTextTraitsID();		// cache original text traits
+}
+
+
+//
+// ClickSelf
+//
+// Broadcast our message when clicked on
+//
+void
+CChameleonBroadcastCaption :: ClickSelf ( const SMouseDownEvent & inEvent )
+{
+	BroadcastMessage ( mMessage );
+	
+} // ClickSelf
+
+
+//
+// MouseWithin
+//
+// If text traits are specified that are different from the default, set them
+// when the mouse is within this view
+//
+void
+CChameleonBroadcastCaption :: MouseWithin ( Point inWhere, const EventRecord & inEvent )
+{
+#if 0
+	if ( GetTextTraitsID() != mRolloverTraits ) {
+		SetTextTraitsID ( mRolloverTraits );	
+		Draw(NULL);
+	}
+#endif
+
+} // MouseWithin
+
+
+//
+// MouseLeave
+//
+// Restore the text traits to normal when the mouse leaves.
+//
+void
+CChameleonBroadcastCaption :: MouseLeave ( Point inWhere, const EventRecord & inEvent )
+{
+#if 0
+	if ( mSavedTraits != GetTextTraitsID() ) {
+		SetTextTraitsID ( mSavedTraits );
+		Draw(NULL);
+	}
+#endif	
+} // MouseLeave
diff --git a/lib/mac/UserInterface/CColorCaption.h b/lib/mac/UserInterface/CColorCaption.h
new file mode 100644
index 000000000000..b49163238ddd
--- /dev/null
+++ b/lib/mac/UserInterface/CColorCaption.h
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#pragma once
+
+#include <LGACaption.h>
+#include <LBroadcaster.h>
+
+
+//
+// CChameleonCaption (should be renamed to CColorCaption)
+//
+// A caption that can have its text color set dynamically (not just by
+// text traits).
+//
+
+class CChameleonCaption : public LGACaption
+{
+public:
+	enum { class_ID = 'ccpt' };
+	
+	CChameleonCaption ( LStream * inStream ) ;
+
+	virtual void	SetColor ( RGBColor & textColor, RGBColor & backColor ) ;
+	virtual void	SetColor ( RGBColor & textColor ) ;
+	
+protected:
+
+	virtual void		DrawSelf();	
+
+	RGBColor			mTextColor;
+	RGBColor			mBackColor;
+
+}; // CChameleonCaption
+
+
+//
+// CChameleonBroadcastCaption (should be renamed to CColorCaption)
+//
+// A color-changing caption that broadcasts when you click on it. It will also
+// change text traits on roll-over (disable by passing the same thing for both).
+//
+
+class CChameleonBroadcastCaption : public CChameleonCaption, public LBroadcaster
+{
+public:
+	enum { class_ID = 'ccbc' } ;
+
+	CChameleonBroadcastCaption ( LStream * inStream ) ;
+	
+private:
+	
+	virtual void ClickSelf ( const SMouseDownEvent & inEvent ) ;
+	virtual void MouseWithin ( Point inWhere, const EventRecord & inEvent ) ;
+	virtual void MouseLeave ( Point inWhere, const EventRecord & inEvent ) ;
+	
+	MessageT	mMessage;
+	ResIDT		mRolloverTraits;
+	ResIDT		mSavedTraits;
+
+}; // class CChameleonBroadcastCaption
\ No newline at end of file