diff --git a/uppsrc/CodeEditor/CodeEditor.lay b/uppsrc/CodeEditor/CodeEditor.lay
index 09f1643a1..d622d0b14 100644
--- a/uppsrc/CodeEditor/CodeEditor.lay
+++ b/uppsrc/CodeEditor/CodeEditor.lay
@@ -24,11 +24,11 @@ LAYOUT(BlockReplaceLayout, 408, 136)
 	ITEM(WithDropChoice<EditString>, find, HSizePosZ(56, 8).TopPosZ(4, 19))
 	ITEM(Label, replace_txt, SetLabel(t_("Replace")).LeftPosZ(8, 46).TopPosZ(48, 19))
 	ITEM(WithDropChoice<EditString>, replace, HSizePosZ(56, 8).TopPosZ(48, 19))
-	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(8, 100).BottomPosZ(40, 20))
-	ITEM(Option, wildcards, SetLabel(t_("Wild&cards")).LeftPosZ(96, 88).BottomPosZ(40, 20))
-	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(172, 92).BottomPosZ(40, 20))
-	ITEM(Option, samecase, SetLabel(t_("Mimic case")).LeftPosZ(260, 108).BottomPosZ(40, 20))
-	ITEM(Option, regexp, SetLabel(t_("RegEx")).LeftPosZ(344, 108).BottomPosZ(40, 20))
+	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(8, 84).BottomPosZ(40, 20))
+	ITEM(Option, wildcards, SetLabel(t_("Wild&cards")).LeftPosZ(96, 72).BottomPosZ(40, 20))
+	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(172, 84).BottomPosZ(40, 20))
+	ITEM(Option, samecase, SetLabel(t_("Mimic case")).LeftPosZ(260, 80).BottomPosZ(40, 20))
+	ITEM(Option, regexp, SetLabel(t_("RegEx")).LeftPosZ(344, 64).BottomPosZ(40, 20))
 	ITEM(Button, next, SetLabel(t_("Replace")).RightPosZ(80, 76).BottomPosZ(8, 24))
 	ITEM(Button, close, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 	ITEM(Switch, mode, SetLabel(t_("Replace\nRemove lines without pattern\nRemove line with pattern")).LeftPosZ(8, 396).TopPosZ(28, 16))
diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp
index 608f540c6..a720da129 100644
--- a/uppsrc/Core/Value.cpp
+++ b/uppsrc/Core/Value.cpp
@@ -121,8 +121,8 @@ int Value::Compare(const Value& v) const
 	}
 	if(st != VOIDV) {
 		int q = PolyCompare(v);
-		if(q) return q; // Perhaps optimize this
-		return v.PolyCompare(*this);
+		if(q) return q;
+		return -v.PolyCompare(*this);
 	}
 	return 0;
 }
diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h
index ce9d8e2ad..253cf6bcf 100644
--- a/uppsrc/Core/Value.h
+++ b/uppsrc/Core/Value.h
@@ -64,6 +64,7 @@ public:
 	String   ToString() const                       { return typeid(T).name(); }
 	int      Compare(const T&) const                { NEVER(); return 0; }
 	int      PolyCompare(const Value&) const        { NEVER(); return 0; }
+
 	
 	operator ValueTypeRef();
 };
diff --git a/uppsrc/Core/ValueUtil.cpp b/uppsrc/Core/ValueUtil.cpp
index 2addcf5cc..7e9797b67 100644
--- a/uppsrc/Core/ValueUtil.cpp
+++ b/uppsrc/Core/ValueUtil.cpp
@@ -660,7 +660,7 @@ int StdValueCompare(const Value& a, const Value& b, int language)
 		return cmp<Time>(a, b);
 	if((ta == STRING_V || ta == WSTRING_V) && (tb == STRING_V || tb == WSTRING_V))
 		return GetLanguageInfo(language).Compare(WString(a), WString(b));
-	return cmp<int>(ta, tb);
+	return a.Compare(b);
 }
 
 int StdValueCompare(const Value& a, const Value& b)
diff --git a/uppsrc/Draw/Display.cpp b/uppsrc/Draw/Display.cpp
index e4fe7ed29..ec4cc4703 100644
--- a/uppsrc/Draw/Display.cpp
+++ b/uppsrc/Draw/Display.cpp
@@ -8,19 +8,54 @@ NAMESPACE_UPP
 
 #define LLOG(x) // RLOG(x)
 
+AttrText& AttrText::Set(const Value& v)
+{
+	value = v;
+	text = AsString(v);
+	return *this;
+}
+
 AttrText::operator Value() const
 {
-	return RawToValue(*this);
+	return RichToValue(*this);
 }
 
 AttrText::AttrText(const Value& v)
 {
-	if(IsString(v)) {
-		Init();
-		text = v;
-	}
-	else
+	if(v.Is<AttrText>())
 		*this = ValueTo<AttrText>(v);
+	else {
+		Init();
+		Set(v);
+	}
+}
+
+void AttrText::Serialize(Stream& s)
+{
+	int version = 0;
+	s / version
+	  % text % font % ink % normalink % paper % normalpaper % align % img % imgspc;
+}
+
+void AttrText::Jsonize(JsonIO& jio)
+{
+	jio
+		("text", text)
+		("value", value)
+		("font", font)
+		("ink", ink)
+		("normalink", normalink)
+		("paper", paper)
+		("normalpaper", normalpaper)
+		("align", align)
+		("img", img)
+		("imgspc", imgspc)
+	;
+}
+
+void AttrText::Xmlize(XmlIO& xio)
+{
+	XmlizeByJsonize(xio, *this);
 }
 
 void AttrText::Init()
@@ -34,26 +69,6 @@ void AttrText::Init()
 	imgspc = 0;
 }
 
-AttrText::AttrText(const char *text) : text(text)
-{
-	Init();
-}
-
-AttrText::AttrText(const wchar *text) : text(text)
-{
-	Init();
-}
-
-AttrText::AttrText(const WString& text) : text(text)
-{
-	Init();
-}
-
-AttrText::AttrText(const String& text) : text(text.ToWString())
-{
-	Init();
-}
-
 class StdDisplayClass : public Display
 {
 public:
@@ -106,7 +121,7 @@ void StdDisplayClass::Paint0(Draw& w, const Rect& r, const Value& q,
 	int width = r.GetWidth();
 	if(IsType<AttrText>(q)) {
 		const AttrText& t = ValueTo<AttrText>(q);
-		txt = t.text;
+		txt = t.text.ToWString();
 		font = t.font;
 		if(!IsNull(t.paper))
 			paper = t.paper;
@@ -159,7 +174,7 @@ Size StdDisplayClass::GetStdSize(const Value& q) const
 	Size isz(0, 0);
 	if(IsType<AttrText>(q)) {
 		const AttrText& t = ValueTo<AttrText>(q);
-		txt = t.text;
+		txt = t.text.ToWString();
 		font = t.font;
 		if(!IsNull(t.img)) {
 			isz = t.img.GetSize();
diff --git a/uppsrc/Draw/Display.h b/uppsrc/Draw/Display.h
index 55dc843b6..930ef537f 100644
--- a/uppsrc/Draw/Display.h
+++ b/uppsrc/Draw/Display.h
@@ -19,8 +19,9 @@ public:
 	virtual ~Display();
 };
 
-struct AttrText {
-	WString text;
+struct AttrText : public ValueType<AttrText, 151, Moveable<AttrText> > {
+	String  text;
+	Value   value;
 	Font    font;
 	Color   ink;
 	Color   normalink;
@@ -30,13 +31,13 @@ struct AttrText {
 	Image   img;
 	int     imgspc;
 
-	AttrText& Set(const char *s)                    { text = s; return *this; }
-	AttrText& Set(const wchar *s)                   { text = s; return *this; }
-	AttrText& Set(const WString& s)                 { text = s; return *this; }
-	AttrText& operator=(const char *s)              { text = s; return *this; }
-	AttrText& operator=(const wchar *s)             { text = s; return *this; }
-	AttrText& operator=(const WString& s)           { text = s; return *this; }
-	AttrText& operator=(const String& s)            { text = s.ToWString(); return *this; }
+	AttrText& Set(const Value& v);
+	AttrText& operator=(const Value& v)             { Set(v); }
+	
+	AttrText& Text(const String& txt)               { text = txt; return *this; }
+	AttrText& Text(const WString& txt)              { text = txt.ToString(); return *this; }
+	AttrText& Text(const char *txt)                 { text = txt; return *this; }
+
 	AttrText& Ink(Color c)                          { ink = c; return *this; }
 	AttrText& NormalInk(Color c)                    { normalink = c; return *this; }
 	AttrText& Paper(Color c)                        { paper = c; return *this; }
@@ -54,13 +55,23 @@ struct AttrText {
 	AttrText& Right()                               { return Align(ALIGN_RIGHT); }
 	AttrText& SetImage(const Image& m, int spc = 4) { img = m; imgspc = spc; return *this; }
 
+	void  Serialize(Stream& s);
+	void  Jsonize(JsonIO& jio);
+	void  Xmlize(XmlIO& xio);
+
+	bool  operator==(const AttrText& f) const       { return value == f.value; }
+	bool  operator!=(const AttrText& f) const       { return !operator==(f); }
+
+	dword GetHashValue() const                      { return CombineHash(text, font, ink, paper); }
+	bool  IsNullInstance() const                    { return IsNull(text); }
+	void  SetNull()                                 { Init(); img = Null; text = Null; }
+
+	String   ToString() const                       { return AsString(value); }
+	int      Compare(const AttrText& x) const       { return value.Compare(x.value); }
+	int      PolyCompare(const Value& v) const      { DLOG("PolyCompare " << value << ' ' << v << ": " << value.Compare(v)); return value.Compare(v); }
+
 	operator Value() const;
 	AttrText(const Value& v);
-
-	explicit AttrText(const char *text);
-	explicit AttrText(const wchar *text);
-	explicit AttrText(const WString& text);
-	explicit AttrText(const String& text);
 	AttrText()                                      { Init(); }
 
 private:
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index dafd23ef6..ea744d5d1 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -21,7 +21,7 @@ library(OSX11) "fontconfig freetype expat";
 library(FREEBSD) xcb;
 
 file
-	Draw.h options PCH,
+	Draw.h options(BUILDER_OPTION) PCH,
 	FontInt.h,
 	Font.cpp,
 	FontCR.cpp,
diff --git a/uppsrc/Draw/src.tpp/Display$en-us.tpp b/uppsrc/Draw/src.tpp/Display$en-us.tpp
index 71d55fffb..30a8be232 100644
--- a/uppsrc/Draw/src.tpp/Display$en-us.tpp
+++ b/uppsrc/Draw/src.tpp/Display$en-us.tpp
@@ -98,10 +98,13 @@ keep aspect ratio with cx.&]
 [ {{10000t/25b/25@(113.42.0) [s0;%- [*@(229)4 AttrText]]}}&]
 [s3; &]
 [s1;:AttrText`:`:struct:%- [@(0.0.255) struct]_AttrText&]
-[s9; Simple helper class convertible to the Value. StdDisplay, StdRightDisplay 
+[s9; Helper class convertible to the Value. StdDisplay, StdRightDisplay 
 and StdCenterDisplay detect whether Value passed in is of AttrText 
 type and handle it differently by adopting non`-null attributes 
-for the text painted.&]
+for the text painted. AttrText is `'rich`' Value type, supporting 
+comparison and serialization. It can be compred to other Value 
+types. It is also possible to assign text that is different from 
+AttrText value.&]
 [s3;%- &]
 [s0;%- &]
 [ {{10000F(128)G(128)@1 [s0; [* Public Member List]]}}&]
@@ -110,11 +113,15 @@ for the text painted.&]
 [s2; Text to be displayed.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:font:%- [_^Font^ Font]_font&]
+[s5;:AttrText`:`:value:%- [_^Value^ Value]_[* value]&]
+[s2; Represents Value of AttrText, usually for comparison/sorting.&]
+[s3;%- &]
+[s4;%- &]
+[s5;:AttrText`:`:font:%- [_^Font^ Font]_[* font]&]
 [s2; Font of text. It is default initialized by constructor to StdFont.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:ink:%- [_^Color^ Color]_ink&]
+[s5;:AttrText`:`:ink:%- [_^Color^ Color]_[* ink]&]
 [s2; Text color.&]
 [s3;%- &]
 [s4;%- &]
@@ -123,45 +130,46 @@ for the text painted.&]
 nor read`-only state.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:paper:%- [_^Color^ Color]_paper&]
+[s5;:AttrText`:`:paper:%- [_^Color^ Color]_[* paper]&]
 [s2; Background color&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:align:%- [@(0.0.255) int]_align&]
+[s5;:AttrText`:`:normalpaper:%- [_^Color^ Color]_[* normalpaper]&]
+[s2; Background color to be used if the item is not in selected nor 
+focused nor read`-only state.&]
+[s3;%- &]
+[s4;%- &]
+[s5;:AttrText`:`:align:%- [@(0.0.255) int]_[* align]&]
 [s2; Current alignment. Can be one of ALIGN`_LEFT, ALIGN`_RIGHT, 
 ALIGN`_CENTER.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:img:%- [_^Image^ Image]_img&]
+[s5;:AttrText`:`:img:%- [_^Image^ Image]_[* img]&]
 [s2; Icon aligned to the left side.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:imgspc:%- [@(0.0.255) int]_imgspc&]
+[s5;:AttrText`:`:imgspc:%- [@(0.0.255) int]_[* imgspc]&]
 [s2; Space between icon and text.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:Set`(const char`*`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Set([@(0.0.255) c
-onst]_[@(0.0.255) char]_`*[@3 s])&]
-[s5;:AttrText`:`:Set`(const wchar`*`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Set([@(0.0.255) c
-onst]_[_^wchar^ wchar]_`*[@3 s])&]
-[s5;:AttrText`:`:Set`(const WString`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Set([@(0.0.255) c
-onst]_[_^WString^ WString][@(0.0.255) `&]_[@3 s])&]
-[s5;:AttrText`:`:operator`=`(const char`*`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_oper
-ator`=([@(0.0.255) const]_[@(0.0.255) char]_`*[@3 s])&]
-[s5;:AttrText`:`:operator`=`(const wchar`*`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_ope
-rator`=([@(0.0.255) const]_[_^wchar^ wchar]_`*[@3 s])&]
-[s5;:AttrText`:`:operator`=`(const WString`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_o
-perator`=([@(0.0.255) const]_[_^WString^ WString][@(0.0.255) `&]_[@3 s])&]
-[s2; Sets the text to [%-*@3 s].&]
+[s5;:AttrText`:`:Set`(const Value`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Set]([@(0.0.255) c
+onst]_[_^Value^ Value][@(0.0.255) `&]_[*@3 v])&]
+[s5;:AttrText`:`:operator`=`(const Value`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* op
+erator`=]([@(0.0.255) const]_[_^Value^ Value][@(0.0.255) `&]_[*@3 v])&]
+[s2; Sets the value of AttrText and also text of it (using AsString).&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:operator`=`(const String`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* o
-perator`=]([@(0.0.255) const]_[_^String^ String][@(0.0.255) `&]_[*@3 s])&]
-[s2; Sets the text to [%-*@3 s].&]
+[s5;:AttrText`:`:Text`(const String`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Text]([@(0.0.255) c
+onst]_[_^String^ String][@(0.0.255) `&]_[*@3 txt])&]
+[s5;:AttrText`:`:Text`(const WString`&`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Text](
+[@(0.0.255) const]_[_^WString^ WString][@(0.0.255) `&]_[*@3 txt])&]
+[s5;:AttrText`:`:Text`(const char`*`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Text]([@(0.0.255) c
+onst]_[@(0.0.255) char]_`*[*@3 txt])&]
+[s2; Sets the text independent of Value.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:Ink`(Color`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Ink([_^Color^ Color]_
-[@3 c])&]
+[s5;:AttrText`:`:Ink`(Color`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Ink]([_^Color^ Colo
+r]_[@3 c])&]
 [s2; Sets the text color.&]
 [s7; [%-*C@3 c]-|The color.&]
 [s7; [*/ Return value]-|`*this.&]
@@ -173,8 +181,8 @@ perator`=]([@(0.0.255) const]_[_^String^ String][@(0.0.255) `&]_[*@3 s])&]
 nor focused nor read`-only state.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:Paper`(Color`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Paper([_^Color^ Co
-lor]_[@3 c])&]
+[s5;:AttrText`:`:Paper`(Color`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Paper]([_^Color^ C
+olor]_[@3 c])&]
 [s2; Sets the paper color.&]
 [s7; [%-*C@3 c]-|The color.&]
 [s7; [*/ Return value]-|`*this.&]
@@ -186,7 +194,7 @@ er]([_^Color^ Color]_[*@3 c])&]
 nor focused nor read`-only state.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:SetFont`(Font`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_SetFont([_^Font^ F
+[s5;:AttrText`:`:SetFont`(Font`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* SetFont]([_^Font^ F
 ont]_[@3 f])&]
 [s2; Sets the font.&]
 [s7; [%-*C@3 f]-|The font.&]
@@ -213,53 +221,41 @@ ool]_[*@3 b]_`=_[@(0.0.255) true])&]
 [s2; Calls font.Strikeout([%-*@3 b]). Returns `*this.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:Align`(int`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Align([@(0.0.255) in
-t]_[@3 a])&]
+[s5;:AttrText`:`:Align`(int`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Align]([@(0.0.255) i
+nt]_[@3 a])&]
 [s2; Sets the text horizontal alignment. Approved values are ALIGN`_LEFT, 
 ALIGN`_CENTER and ALIGN`_RIGHT.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:Left`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Left()&]
+[s5;:AttrText`:`:Left`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Left]()&]
 [s2; Aligns the text left.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:Center`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Center()&]
+[s5;:AttrText`:`:Center`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Center]()&]
 [s2; Aligns the text to the center.&]
 [s3;%- &]
 [s4;%- &]
-[s5;:AttrText`:`:Right`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_Right()&]
+[s5;:AttrText`:`:Right`(`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_[* Right]()&]
 [s2; Aligns the text right.&]
 [s3;%- &]
 [s4;%- &]
 [s5;:AttrText`:`:SetImage`(const Image`&`,int`):%- [_^AttrText^ AttrText][@(0.0.255) `&]_
-SetImage([@(0.0.255) const]_[_^Image^ Image][@(0.0.255) `&]_[@3 m], [@(0.0.255) int]_[@3 spc]_
-`=_[@3 4])&]
+[* SetImage]([@(0.0.255) const]_[_^Image^ Image][@(0.0.255) `&]_[@3 m], 
+[@(0.0.255) int]_[@3 spc]_`=_[@3 4])&]
 [s2; Sets the icon and space between the icon and text.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:operator Value`(`)const:%- operator_Value()_[@(0.0.255) const]&]
-[s7; [*/ Return value]-|AttrText as raw Value.&]
+[s5;:AttrText`:`:operator Value`(`)const:%- operator_[* Value]()_[@(0.0.255) const]&]
+[s7; Converts AttrText to Value.&]
 [s3;%- &]
 [s4;%- &]
 [s5;:AttrText`:`:AttrText`(const Value`&`):%- [* AttrText]([@(0.0.255) const]_[_^Value^ Val
 ue][@(0.0.255) `&]_[*@3 v])&]
-[s2; Converts Value to AttrText. Value can be either of AttrText 
-type, or IsString type.&]
+[s2; Converts Value to AttrText. If [%-*@3 v] is not AttrText, it gets 
+Set as Value of default constructed AttrText.&]
 [s3; &]
 [s4;%- &]
-[s5;:AttrText`:`:AttrText`(const char`*`):%- [* AttrText]([@(0.0.255) const]_[@(0.0.255) ch
-ar]_`*[@3 text])&]
-[s5;:AttrText`:`:AttrText`(const wchar`*`):%- [* AttrText]([@(0.0.255) const]_[_^wchar^ wch
-ar]_`*[@3 text])&]
-[s5;:AttrText`:`:AttrText`(const WString`&`):%- [* AttrText]([@(0.0.255) const]_[_^WString^ W
-String][@(0.0.255) `&]_[@3 text])&]
-[s5;:AttrText`:`:AttrText`(const String`&`):%- [* AttrText]([@(0.0.255) const]_[_^String^ S
-tring][@(0.0.255) `&]_[*@3 text])&]
-[s2; Assigns text attribute. Assigns Null to all other members except 
-font, which is initialized to StdFont.&]
-[s3; &]
-[s4;%- &]
-[s5;:AttrText`:`:AttrText`(`):%- AttrText()&]
+[s5;:AttrText`:`:AttrText`(`):%- [* AttrText]()&]
 [s2; Default constructor. Assigns Null to all members except font, 
 which is initialized to StdFont.&]
 [s3; &]