diff --git a/uppsrc/Core/CharSet.h b/uppsrc/Core/CharSet.h
index 9fcf69e61..63a556df2 100644
--- a/uppsrc/Core/CharSet.h
+++ b/uppsrc/Core/CharSet.h
@@ -10,6 +10,7 @@ enum {
 #define  CHARSET_TOASCII      253
 #define  CHARSET_UTF32        254 // auxilary
 #define  CHARSET_UTF8         255
+#define  CHARSET_UNICODE      255 // deprecated
 
 enum {
 	DEFAULTCHAR = 0x1f
diff --git a/uppsrc/ide/LayDes/LayDes.h b/uppsrc/ide/LayDes/LayDes.h
index 541364dc2..6aeaf27e6 100644
--- a/uppsrc/ide/LayDes/LayDes.h
+++ b/uppsrc/ide/LayDes/LayDes.h
@@ -201,7 +201,7 @@ public:
 	String   SaveProperties(int y = 0) const;
 	String   Save(int i, int y, const String& eol) const;
 
-	LayoutItem()                        { csize.cx = -1; hide = false; charset = CHARSET_UNICODE; }
+	LayoutItem()                        { csize.cx = -1; hide = false; charset = CHARSET_UTF8; }
 };
 
 Image GetTypeIcon(const String& type, int cx, int cy, int i, Color bg);
@@ -246,7 +246,7 @@ public:
 
 	rval_default(LayoutData);
 
-	LayoutData() { size = Size(400, 200); charset = CHARSET_UNICODE; }
+	LayoutData() { size = Size(400, 200); charset = CHARSET_UTF8; }
 };
 
 class LayDesigner;
diff --git a/uppsrc/ide/LayDes/textprop.cpp b/uppsrc/ide/LayDes/textprop.cpp
index 1b2ca64c3..4f900e827 100644
--- a/uppsrc/ide/LayDes/textprop.cpp
+++ b/uppsrc/ide/LayDes/textprop.cpp
@@ -42,7 +42,7 @@ String NoCr(const String& s)
 
 int  LTProperty::Filter(int chr) const
 {
-	return charset == CHARSET_UNICODE ? chr : FromUnicode(chr, charset) == DEFAULTCHAR ? 0 : chr;
+	return charset == CHARSET_UTF8 ? chr : FromUnicode(chr, charset) == DEFAULTCHAR ? 0 : chr;
 }
 
 void LTProperty::EditAction()
@@ -56,7 +56,7 @@ LTProperty::LTProperty()
 	context.WhenAction = THISBACK(Context);
 	id = LayImg::Id();
 	id.WhenAction = THISBACK(Id);
-	charset = CHARSET_UNICODE; //!! not good, but better than a crash; TRC 06/04/10//TODO
+	charset = CHARSET_UTF8; //!! not good, but better than a crash; TRC 06/04/10//TODO
 }
 
 void LTProperty::SyncLid()