diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp
index d4dd4a3f3..7dbc2a6e4 100644
--- a/uppsrc/CodeEditor/CodeEditor.cpp
+++ b/uppsrc/CodeEditor/CodeEditor.cpp
@@ -294,7 +294,7 @@ void CodeEditor::IndentInsert(int chr, int count) {
 		InsertChar(chr, count);
 }
 
-void CodeEditor::Make(Callback1<String&> op)
+void CodeEditor::Make(Event<String&> op)
 {
 	Point cursor = GetColumnLine(GetCursor());
 	Point scroll = GetScrollPos();
@@ -1039,9 +1039,9 @@ CodeEditor::CodeEditor() {
 	UndoSteps(10000);
 	InitFindReplace();
 	bar.WhenBreakpoint = THISBACK(ForwardWhenBreakpoint);
-	bar.WhenAnnotationMove = Proxy(WhenAnnotationMove);
-	bar.WhenAnnotationClick = Proxy(WhenAnnotationClick);
-	bar.WhenAnnotationRightClick = Proxy(WhenAnnotationRightClick);
+	bar.WhenAnnotationMove = WhenAnnotationMove.Proxy();
+	bar.WhenAnnotationClick = WhenAnnotationClick.Proxy();
+	bar.WhenAnnotationRightClick = WhenAnnotationRightClick.Proxy();
 	barline = true;
 	sb.WithSizeGrip();
 	DefaultHlStyles();
diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h
index 047517485..98ec655ab 100644
--- a/uppsrc/CodeEditor/CodeEditor.h
+++ b/uppsrc/CodeEditor/CodeEditor.h
@@ -87,10 +87,10 @@ private:
 	void    sPaintImage(Draw& w, int y, int fy, const Image& img);
 
 public:
-	Callback1<int> WhenBreakpoint;
-	Callback       WhenAnnotationMove;
-	Callback       WhenAnnotationClick;
-	Callback       WhenAnnotationRightClick;
+	Event<int> WhenBreakpoint;
+	Event<>        WhenAnnotationMove;
+	Event<>        WhenAnnotationClick;
+	Event<>        WhenAnnotationRightClick;
 
 	void InsertLines(int i, int count);
 	void RemoveLines(int i, int count);
@@ -322,7 +322,7 @@ protected:
 	void   ToggleLineComments(bool usestars = false);
 	void   ToggleStarComments();
 	void   Enclose(const char *c1, const char *c2, int l = -1, int h = -1);
-	void   Make(Callback1<String&> op);
+	void   Make(Event<String&> op);
 	void   TabsOrSpaces(String& out, bool maketabs);
 	void   LineEnds(String& out);
 
@@ -341,16 +341,16 @@ public:
 		Size           sz;
 	};
 
-	Callback           WhenSelection;
+	Event<>            WhenSelection;
 	Gate1<MouseTip&>   WhenTip;
-	Callback           WhenLeftDown;
-	Callback1<int>     WhenCtrlClick;
-	Callback           WhenAnnotationMove;
-	Callback           WhenAnnotationClick;
-	Callback           WhenAnnotationRightClick;
-	Callback           WhenOpenFindReplace;
-	Callback1<String&> WhenPaste;
-	Callback           WhenUpdate;
+	Event<>            WhenLeftDown;
+	Event<int>     WhenCtrlClick;
+	Event<>            WhenAnnotationMove;
+	Event<>            WhenAnnotationClick;
+	Event<>            WhenAnnotationRightClick;
+	Event<>            WhenOpenFindReplace;
+	Event<String&> WhenPaste;
+	Event<>            WhenUpdate;
 
 	FrameTop<Button>    topsbbutton;
 	FrameTop<Button>    topsbbutton1;
@@ -419,7 +419,7 @@ public:
 	void   TabRight();
 	void   TabLeft();
 
-	Callback1<int> WhenBreakpoint;
+	Event<int> WhenBreakpoint;
 
 
 	void    CheckEdited(bool e = true)                { check_edited = e; }
diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index 1a18ab690..5e7090b8b 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -637,8 +637,8 @@ void CodeEditor::FindReplace(bool pick_selection, bool pick_text, bool replace)
 		findreplace.amend_all.Hide();
 		findreplace.amend_rest.Hide();
 		findreplace.prev.Hide();
-		findreplace.next.Ok() <<= findreplace.Breaker(IDOK);
-		findreplace.close.Cancel() <<= findreplace.Breaker(IDCANCEL);
+		findreplace.next.Ok() << findreplace.Breaker(IDOK);
+		findreplace.close.Cancel() << findreplace.Breaker(IDCANCEL);
 		findreplace.close.SetImage(Null);
 		findreplace.close.Tip("");
 		findreplace.next.SetImage(Null);
diff --git a/uppsrc/CodeEditor/Register.cpp b/uppsrc/CodeEditor/Register.cpp
index 6b078b26b..60c1d3998 100644
--- a/uppsrc/CodeEditor/Register.cpp
+++ b/uppsrc/CodeEditor/Register.cpp
@@ -8,7 +8,7 @@ ArrayMap<String, EditorSyntax::SyntaxDef>& EditorSyntax::defs()
 	return d;
 }
 
-void EditorSyntax::Register(const char *id, Callback1<One<EditorSyntax>&> factory,
+void EditorSyntax::Register(const char *id, Event<One<EditorSyntax>&> factory,
                             const char *exts, const char *description)
 {
 	SyntaxDef& f = defs().GetAdd(id);
diff --git a/uppsrc/CodeEditor/Syntax.h b/uppsrc/CodeEditor/Syntax.h
index 10338190e..85eff5815 100644
--- a/uppsrc/CodeEditor/Syntax.h
+++ b/uppsrc/CodeEditor/Syntax.h
@@ -89,7 +89,7 @@ public:
 
 class EditorSyntax : public HighlightSetup { // Inheriting to make static members available
 	struct SyntaxDef {
-		Callback1<One<EditorSyntax>&> factory;
+		Event<One<EditorSyntax>&> factory;
 		String                        patterns;
 		String                        description;
 	};
@@ -121,7 +121,7 @@ public:
 
 	EditorSyntax()                         { Clear(); ignore_errors = false; }
 
-	static void Register(const char *id, Callback1<One<EditorSyntax>&> factory,
+	static void Register(const char *id, Event<One<EditorSyntax>&> factory,
 	                     const char *exts, const char *description);
 	static One<EditorSyntax> Create(const char *id);
 	static String            GetSyntaxForFilename(const char *fn);
diff --git a/uppsrc/Core/Callback.h b/uppsrc/Core/Callback.h
index 2b97ee419..7372368f8 100644
--- a/uppsrc/Core/Callback.h
+++ b/uppsrc/Core/Callback.h
@@ -1,114 +1,33 @@
-enum CNULLer { CNULL };
+// Backward compatibility
 
-template<typename Res, typename... ArgTypes>
-class Function<Res(ArgTypes...)> : Moveable<Function<Res(ArgTypes...)>> {
-	struct WrapperBase {
-		Atomic  refcount;
-
-		virtual Res Execute(ArgTypes... args) = 0;
-		
-		WrapperBase() { refcount = 1; }
-		virtual ~WrapperBase() {}
-	};
-
-	template <class F>
-	struct Wrapper : WrapperBase {
-		F fn;
-		virtual Res Execute(ArgTypes... args) { return fn(args...); }
-
-		Wrapper(F&& fn) : fn(pick(fn)) {}
-	};
-
-	template <class F>
-	struct Wrapper2 : WrapperBase {
-		Function l;
-		F        fn;
-
-		virtual Res Execute(ArgTypes... args) { l(args...); return fn(args...); }
-
-		Wrapper2(const Function& l, F&& fn) : l(l), fn(pick(fn)) {}
-		Wrapper2(const Function& l, const F& fn) : l(l), fn(fn) {}
-	};
-
-	WrapperBase *ptr;
-	
-	static void Free(WrapperBase *ptr) {
-		if(ptr && AtomicDec(ptr->refcount) == 0)
-			delete ptr;
-	}
-	
-	void Copy(const Function& a) {
-		ptr = a.ptr;
-		if(ptr)
-			AtomicInc(ptr->refcount);
-	}
-	
-	void Pick(Function&& src) {
-		ptr = src.ptr;
-		src.ptr = NULL;
-	}
-
-public:
-	Function()                                 { ptr = NULL; }
-	Function(CNULLer)                          { ptr = NULL; }
-	
-	template <class F> Function(F fn)          { ptr = new Wrapper<F>(pick(fn)); }
-	
-	Function(const Function& src)              { Copy(src); }
-	Function& operator=(const Function& src)   { auto b = ptr; Copy(src); Free(b); return *this; }
-
-	Function(Function&& src)                   { Pick(pick(src)); }
-	Function& operator=(Function&& src)        { if(&src != this) { Free(ptr); ptr = src.ptr; src.ptr = NULL; } return *this; }
-	
-	Function Proxy() const                     { return [=] (ArgTypes... args) { return (*this)(args...); }; }
-
-	template <class F>
-	Function& operator<<(const F& fn)          { if(!ptr) { Copy(fn); return *this; }
-	                                             WrapperBase *b = ptr; ptr = new Wrapper2<F>(*this, fn); Free(b); return *this; }
-
-	template <class F>
-	Function& operator<<(F&& fn)               { if(!ptr) { Pick(pick(fn)); return *this; }
-	                                             WrapperBase *b = ptr; ptr = new Wrapper2<F>(*this, pick(fn)); Free(b); return *this; }
-
-	Res operator()(ArgTypes... args) const     { return ptr ? ptr->Execute(args...) : Res(); }
-	
-	operator bool() const                      { return ptr; }
-	void Clear()                               { Free(ptr); ptr = NULL; }
-
-	friend void Swap(Function& a, Function& b) { UPP::Swap(a.ptr, b.ptr); }
-
-	~Function()                                { Free(ptr); }
-};
-
-// we need "isolation level" to avoid overloading issues
 template <class... ArgTypes>
-class Event : Moveable<Event<ArgTypes...>> {
+class CallbackN : Moveable<CallbackN<ArgTypes...>> {
 	typedef Function<void (ArgTypes...)> Fn;
 
 	Fn fn;
 
 public:
-	Event() {}
-	Event(const Event& src) : fn(src.fn)       {}
-	Event& operator=(const Event& src)         { fn = src.fn; return *this; }
+	CallbackN() {}
+	CallbackN(const CallbackN& src) : fn(src.fn)       {}
+	CallbackN& operator=(const CallbackN& src)         { fn = src.fn; return *this; }
 
-	Event(Fn&& src, int) : fn(pick(src))       {} // Helper for callback compatibility code
+	CallbackN(Fn&& src, int) : fn(pick(src))       {} // Helper for callback compatibility code
 	template <class F>
-	Event(F src, int) : fn(src)                {} // Helper for callback compatibility code
+	CallbackN(F src, int) : fn(src)                {} // Helper for callback compatibility code
 	
-	Event(Event&& src) : fn(pick(src.fn))      {}
-	Event& operator=(Event&& src)              { fn = pick(src.fn); return *this; }
+	CallbackN(CallbackN&& src) : fn(pick(src.fn))      {}
+	CallbackN& operator=(CallbackN&& src)              { fn = pick(src.fn); return *this; }
 
-	Event(CNULLer)                             {}
-	Event& operator=(CNULLer)                  { fn.Clear(); return *this; }
+	CallbackN(CNULLer)                             {}
+	CallbackN& operator=(CNULLer)                  { fn.Clear(); return *this; }
 
-	Event Proxy() const                        { return Event(fn.Proxy(), 1); }
+	CallbackN Proxy() const                        { return CallbackN(fn.Proxy(), 1); }
 
 	template <class F>
-	Event& operator<<(const F& f)              { fn << f; return *this; }
+	CallbackN& operator<<(const F& f)              { fn << f; return *this; }
 
 	template <class F>
-	Event& operator<<(F&& f)                   { fn << pick(f); return *this; }
+	CallbackN& operator<<(F&& f)                   { fn << pick(f); return *this; }
 	
 	void operator()(ArgTypes... args) const    { return fn(args...); }
 
@@ -116,13 +35,13 @@ public:
 	operator bool() const                      { return fn; }
 	void Clear()                               { fn.Clear(); }
 	
-	friend Event Proxy(const Event& a)   { return a.Proxy(); }
-	friend void Swap(Event& a, Event& b) { UPP::Swap(a.fn, b.fn); }
+	friend CallbackN Proxy(const CallbackN& a)   { return a.Proxy(); }
+	friend void Swap(CallbackN& a, CallbackN& b) { UPP::Swap(a.fn, b.fn); }
 };
 
 // we need "isolation level" to avoid overloading issues
 template <class... ArgTypes>
-class EventGate : Moveable<EventGate<ArgTypes...>> {
+class GateN : Moveable<GateN<ArgTypes...>> {
 	typedef Function<bool (ArgTypes...)> Fn;
 
 	Fn fn;
@@ -130,27 +49,27 @@ class EventGate : Moveable<EventGate<ArgTypes...>> {
 	void Set(bool b) { if(b) fn = [](ArgTypes...) { return true; }; else fn.Clear(); }
 
 public:
-	EventGate()                                {}
+	GateN()                                {}
 
-	EventGate(bool b)                          { Set(b); }
-	EventGate& operator=(bool b)               { Set(b); return *this; }
+	GateN(bool b)                          { Set(b); }
+	GateN& operator=(bool b)               { Set(b); return *this; }
 
-	EventGate(const EventGate& a) : fn(a.fn)   {}
-	EventGate& operator=(const EventGate& a)   { fn = a.fn; return *this; }
+	GateN(const GateN& a) : fn(a.fn)   {}
+	GateN& operator=(const GateN& a)   { fn = a.fn; return *this; }
 
-	EventGate(Fn&& src, int) : fn(pick(src))   {}
-	EventGate& operator=(EventGate&& a)        { fn = pick(a.fn); return *this; }
+	GateN(Fn&& src, int) : fn(pick(src))   {}
+	GateN& operator=(GateN&& a)        { fn = pick(a.fn); return *this; }
 
-	EventGate(CNULLer)                         {}
-	EventGate& operator=(CNULLer)              { fn.Clear(); return *this; }
+	GateN(CNULLer)                         {}
+	GateN& operator=(CNULLer)              { fn.Clear(); return *this; }
 
-	EventGate Proxy() const                    { return fn.Proxy(); }
+	GateN Proxy() const                    { return fn.Proxy(); }
 
 	template <class F>
-	EventGate& operator<<(const F& f)          { fn << f; return *this; }
+	GateN& operator<<(const F& f)          { fn << f; return *this; }
 
 	template <class F>
-	EventGate& operator<<(F&& f)               { fn << pick(f); return *this; }
+	GateN& operator<<(F&& f)               { fn << pick(f); return *this; }
 	
 	bool operator()(ArgTypes... args) const    { return fn(args...); }
 
@@ -158,31 +77,31 @@ public:
 	operator bool() const                      { return fn; }
 	void Clear()                               { fn.Clear(); }
 
-	friend EventGate Proxy(const EventGate& a)     { return a.Proxy(); }
-	friend void Swap(EventGate& a, EventGate& b)   { UPP::Swap(a.fn, b.fn); }
+	friend GateN Proxy(const GateN& a)     { return a.Proxy(); }
+	friend void Swap(GateN& a, GateN& b)   { UPP::Swap(a.fn, b.fn); }
 };
 
 // backward compatibility
-typedef Event<> Callback;
-template <class P1> using Callback1 = Event<P1>;
-template <class P1, class P2> using Callback2 = Event<P1, P2>;
-template <class P1, class P2, class P3> using Callback3 = Event<P1, P2, P3>;
-template <class P1, class P2, class P3, class P4> using Callback4 = Event<P1, P2, P3, P4>;
-template <class P1, class P2, class P3, class P4, class P5> using Callback5 = Event<P1, P2, P3, P4, P5>;
+typedef CallbackN<> Callback;
+template <class P1> using Callback1 = CallbackN<P1>;
+template <class P1, class P2> using Callback2 = CallbackN<P1, P2>;
+template <class P1, class P2, class P3> using Callback3 = CallbackN<P1, P2, P3>;
+template <class P1, class P2, class P3, class P4> using Callback4 = CallbackN<P1, P2, P3, P4>;
+template <class P1, class P2, class P3, class P4, class P5> using Callback5 = CallbackN<P1, P2, P3, P4, P5>;
 
 #define  Res void
-#define  Cb_ Event
+#define  Cb_ CallbackN
 #include "CallbackR.i"
 
-using Gate = EventGate<>;
-template <class P1> using Gate1 = EventGate<P1>;
-template <class P1, class P2> using Gate2 = EventGate<P1, P2>;
-template <class P1, class P2, class P3> using Gate3 = EventGate<P1, P2, P3>;
-template <class P1, class P2, class P3, class P4> using Gate4 = EventGate<P1, P2, P3, P4>;
-template <class P1, class P2, class P3, class P4, class P5> using Gate5 = EventGate<P1, P2, P3, P4, P5>;
+using Gate0 = GateN<>;
+template <class P1> using Gate1 = GateN<P1>;
+template <class P1, class P2> using Gate2 = GateN<P1, P2>;
+template <class P1, class P2, class P3> using Gate3 = GateN<P1, P2, P3>;
+template <class P1, class P2, class P3, class P4> using Gate4 = GateN<P1, P2, P3, P4>;
+template <class P1, class P2, class P3, class P4, class P5> using Gate5 = GateN<P1, P2, P3, P4, P5>;
 
 #define  Res bool
-#define  Cb_ EventGate
+#define  Cb_ GateN
 #include "CallbackR.i"
 
 #define THISBACK(x)                  callback(this, &CLASSNAME::x)
@@ -208,7 +127,7 @@ template <class P1, class P2, class P3, class P4, class P5> using Gate5 = EventG
 
 
 template <class T>
-class EventArgTarget
+class CallbackNArgTarget
 {
 	T result;
 
@@ -216,7 +135,7 @@ class EventArgTarget
 	void Set(T value)                   { result = value; }
 
 public:
-	typedef EventArgTarget CLASSNAME;
+	typedef CallbackNArgTarget CLASSNAME;
 
 	operator const T&() const           { return result; }
 	bool IsNullInstance() const         { return IsNull(result); }
@@ -225,8 +144,8 @@ public:
 	operator Callback1<const T&>()      { return THISBACK(SetResult); }
 	operator Callback1<T>()             { return THISBACK(Set); }
 
-	EventArgTarget()                    { result = Null; }
+	CallbackNArgTarget()                    { result = Null; }
 };
 
 template <class T>
-using CallbackArgTarget = EventArgTarget<T>;
+using CallbackArgTarget = CallbackNArgTarget<T>;
diff --git a/uppsrc/Core/CoWork.h b/uppsrc/Core/CoWork.h
index a76172349..527c856ab 100644
--- a/uppsrc/Core/CoWork.h
+++ b/uppsrc/Core/CoWork.h
@@ -83,8 +83,8 @@ public:
 
 class CoWork : NoCopy {
 public:
-	void     Do(Callback cb)        { cb(); }
-	CoWork&  operator&(Callback cb) { cb(); return *this; }
+	void     Do(Event<>  cb)        { cb(); }
+	CoWork&  operator&(Event<>  cb) { cb(); return *this; }
 	void     Finish()               {}
 	bool     IsFinished()           { return true; }
 
diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index a40595649..8e3356d13 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -283,6 +283,8 @@ class JsonIO;
 #include "Uuid.h"
 #include "Ptr.h"
 
+#include "Function.h"
+
 #include "Callback.h"
 
 #include "Color.h"
diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index 907b6c093..0e3d7d36f 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -108,7 +108,8 @@ file
 	InMap.hpp,
 	Tuple.h,
 	Other.h,
-	Callbacks readonly separator,
+	Function readonly separator,
+	Function.h,
 	CallbackNP.i highlight cpp,
 	CallbackN.i highlight cpp,
 	CallbackR.i highlight cpp,
@@ -184,7 +185,6 @@ file
 	Meta readonly separator,
 	sub.upt,
 	core.upt,
-	ignorelist,
 	core.defs,
 	Info readonly separator,
 	src.tpp,
diff --git a/uppsrc/Core/FilterStream.h b/uppsrc/Core/FilterStream.h
index fbc246cbb..5dc51ae81 100644
--- a/uppsrc/Core/FilterStream.h
+++ b/uppsrc/Core/FilterStream.h
@@ -23,12 +23,12 @@ private:
 
 public:
 	Stream                      *in;
-	Callback2<const void *, int> Filter;
-	Callback                     End;
-	Gate                         More;
+	Event<const void *, int>     Filter;
+	Event<>                      End;
+	Gate<>                       More;
 	void                         Out(const void *ptr, int size);
 	
-	Callback                     WhenOut;
+	Event<>                      WhenOut;
 	
 	template <class F>
 	void Set(Stream& in_, F& filter) {
@@ -63,8 +63,8 @@ protected:
 
 public:
 	Stream                      *out;
-	Callback2<const void *, int> Filter;
-	Callback                     End;
+	Event<const void *, int>     Filter;
+	Event<>                      End;
 	void                         Out(const void *ptr, int size);
 	
 	int64                        GetCount() const             { return count; }
diff --git a/uppsrc/Core/Inet.h b/uppsrc/Core/Inet.h
index 56d0ab609..d4e18d938 100644
--- a/uppsrc/Core/Inet.h
+++ b/uppsrc/Core/Inet.h
@@ -173,7 +173,7 @@ class TcpSocket : NoCopy {
 	TcpSocket(const TcpSocket&);
 
 public:
-	Callback        WhenWait;
+	Event<>         WhenWait;
 	
 	void            SetSockError(const char *context, int code, const char *errdesc);
 
@@ -454,10 +454,10 @@ public:
 		METHOD_PATCH   = 8,
 	};
 
-	Callback2<const void *, int> WhenContent;
-	Callback                     WhenStart;
-	Callback                     WhenDo;
-	Gate                         WhenAuthenticate;
+	Event<const void *, int>  WhenContent;
+	Event<>                   WhenStart;
+	Event<>                   WhenDo;
+	Gate<>                    WhenAuthenticate;
 
 	HttpRequest&  MaxHeaderSize(int m)                   { max_header_size = m; return *this; }
 	HttpRequest&  MaxContentSize(int m)                  { max_content_size = m; return *this; }
diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp
index 41064e4da..6b36acdcc 100644
--- a/uppsrc/Core/Stream.cpp
+++ b/uppsrc/Core/Stream.cpp
@@ -41,6 +41,26 @@ void Stream::Seek(int64) {
 	NEVER();
 }
 
+int Stream::Skip(int size)
+{
+	int r = 0;
+	while(size) {
+		int n = min(int(rdlim - ptr), size);
+		if(n == 0) {
+			if(Get() < 0)
+				break;
+			r++;
+			size--;
+		}
+		else {
+			size -= n;
+			r += n;
+			ptr += n;
+		}
+	}
+	return r;
+}
+
 int64 Stream::GetSize() const {
 	return 0;
 }
@@ -1334,7 +1354,7 @@ int64 CopyStream(Stream& dest, Stream& src, int64 count) {
 	return done;
 }
 
-int64 CopyStream(Stream& dest, Stream& src, int64 count, EventGate<int64, int64> progress)
+int64 CopyStream(Stream& dest, Stream& src, int64 count, Gate<int64, int64> progress)
 {
 	int block = (int)min<int64>(count, 32768);
 	Buffer<byte> temp(block);
@@ -1351,7 +1371,7 @@ int64 CopyStream(Stream& dest, Stream& src, int64 count, EventGate<int64, int64>
 	return done;
 }
 
-void CheckedSerialize(const Callback1<Stream&> serialize, Stream& stream, int version)
+void CheckedSerialize(const Event<Stream&> serialize, Stream& stream, int version)
 {
 	int pos = (int)stream.GetPos();
 	stream.Magic(0x61746164);
@@ -1363,7 +1383,7 @@ void CheckedSerialize(const Callback1<Stream&> serialize, Stream& stream, int ve
 	stream.Magic(pos);
 }
 
-bool Load(Callback1<Stream&> serialize, Stream& stream, int version) {
+bool Load(Event<Stream&> serialize, Stream& stream, int version) {
 	StringStream backup;
 	backup.SetStoring();
 	serialize(backup);
@@ -1390,7 +1410,7 @@ bool Load(Callback1<Stream&> serialize, Stream& stream, int version) {
 	return true;
 }
 
-bool Store(Callback1<Stream&> serialize, Stream& stream, int version) {
+bool Store(Event<Stream&> serialize, Stream& stream, int version) {
 	stream.SetStoring();
 	CheckedSerialize(serialize, stream, version);
 	return !stream.IsError();
@@ -1400,14 +1420,14 @@ String Cfgname(const char *file) {
 	return file ? String(file) : ConfigFile();
 }
 
-bool LoadFromFile(Callback1<Stream&> serialize, const char *file, int version) {
+bool LoadFromFile(Event<Stream&> serialize, const char *file, int version) {
 	FileIn f(Cfgname(file));
 	return f ? Load(serialize, f, version) : false;
 }
 
-bool StoreToFile(Callback1<Stream&> serialize, const char *file, int version) {
+bool StoreToFile(Event<Stream&> serialize, const char *file, int version) {
 	FileOut f(Cfgname(file));
-	if(!Store(serialize, f, version))
+	if(!f || !Store(serialize, f, version))
 		return false;
 	f.Close();
 	return !f.IsError();
diff --git a/uppsrc/Core/Stream.h b/uppsrc/Core/Stream.h
index 01d43ce4e..4c3d813ad 100644
--- a/uppsrc/Core/Stream.h
+++ b/uppsrc/Core/Stream.h
@@ -98,6 +98,8 @@ public:
 	String    Get(int size);
 	String    GetAll(int size);
 	
+	int       Skip(int size);
+	
 	void      LoadThrowing()         { style |= STRM_THROW; }
 	void      LoadError();
 
diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp
index 96c21b6ce..423065013 100644
--- a/uppsrc/Core/Util.cpp
+++ b/uppsrc/Core/Util.cpp
@@ -620,9 +620,9 @@ static VectorMap<String, String>& sGCfg()
 
 static StaticCriticalSection sGCfgLock;
 
-static Vector<Callback>& sGFlush()
+static Vector<Event<> >& sGFlush()
 {
-	static Vector<Callback> m;
+	static Vector<Event<> > m;
 	return m;
 }
 
@@ -636,7 +636,7 @@ void    RegisterGlobalConfig(const char *name)
 	}
 }
 
-void    RegisterGlobalConfig(const char *name, Callback WhenFlush)
+void    RegisterGlobalConfig(const char *name, Event<>  WhenFlush)
 {
 	RegisterGlobalConfig(name);
 	INTERLOCKED_(sGFlushLock) {
diff --git a/uppsrc/Core/Util.h b/uppsrc/Core/Util.h
index d819e678f..970eae766 100644
--- a/uppsrc/Core/Util.h
+++ b/uppsrc/Core/Util.h
@@ -404,12 +404,12 @@ public:
 
 // ------------------- Advanced streaming --------------------
 
-void CheckedSerialize(const Callback1<Stream&> serialize, Stream& stream, int version = Null);
+void CheckedSerialize(const Event<Stream&> serialize, Stream& stream, int version = Null);
 
-bool Load(Callback1<Stream&> serialize, Stream& stream, int version = Null);
-bool Store(Callback1<Stream&> serialize, Stream& stream, int version = Null);
-bool LoadFromFile(Callback1<Stream&> serialize, const char *file = NULL, int version = Null);
-bool StoreToFile(Callback1<Stream&> serialize, const char *file = NULL, int version = Null);
+bool Load(Event<Stream&> serialize, Stream& stream, int version = Null);
+bool Store(Event<Stream&> serialize, Stream& stream, int version = Null);
+bool LoadFromFile(Event<Stream&> serialize, const char *file = NULL, int version = Null);
+bool StoreToFile(Event<Stream&> serialize, const char *file = NULL, int version = Null);
 
 template <class T>
 void SerializeTFn(Stream &s, T *x)
@@ -418,7 +418,7 @@ void SerializeTFn(Stream &s, T *x)
 }
 
 template <class T>
-Callback1<Stream&> SerializeCb(T& x)
+Event<Stream&> SerializeCb(T& x)
 {
 	return callback1(SerializeTFn<T>, &x);
 }
@@ -457,7 +457,7 @@ bool LoadFromString(T& x, const String& s) {
 }
 
 void             RegisterGlobalConfig(const char *name) init_;
-void             RegisterGlobalConfig(const char *name, Callback WhenFlush) init_;
+void             RegisterGlobalConfig(const char *name, Event<>  WhenFlush) init_;
 
 String           GetGlobalConfigData(const char *name);
 void             SetGlobalConfigData(const char *name, const String& data);
diff --git a/uppsrc/Core/Xmlize.cpp b/uppsrc/Core/Xmlize.cpp
index 6c302738b..eb65bfbbe 100644
--- a/uppsrc/Core/Xmlize.cpp
+++ b/uppsrc/Core/Xmlize.cpp
@@ -170,7 +170,7 @@ void XmlizeLang(XmlIO& xml, const char *tag, int& lang, const char *id)
 	XmlizeLangAttr(n, lang, id);
 }
 
-String StoreAsXML(Callback1<XmlIO> xmlize, const char *name)
+String DoStoreAsXML(Event<XmlIO> xmlize, const char *name)
 {
 	String n = Filter(name ? name : "app", CharFilterAlpha);
 	XmlNode node;
@@ -178,7 +178,7 @@ String StoreAsXML(Callback1<XmlIO> xmlize, const char *name)
 	return AsXML(node);
 }
 
-bool LoadFromXML0(Callback1<XmlIO> xmlize, const String& xml)
+bool LoadFromXML0(Event<XmlIO> xmlize, const String& xml)
 {
 	XmlNode node = ParseXML(xml);
 	if(node.GetCount() == 0)
@@ -192,7 +192,7 @@ bool LoadFromXML0(Callback1<XmlIO> xmlize, const String& xml)
 	return true;
 }
 
-bool LoadFromXML(Callback1<XmlIO> xmlize, const String& xml)
+bool DoLoadFromXML(Event<XmlIO> xmlize, const String& xml)
 {
 	try {
 		return LoadFromXML0(xmlize, xml);
@@ -201,7 +201,7 @@ bool LoadFromXML(Callback1<XmlIO> xmlize, const String& xml)
 	return false;
 }
 
-bool TryLoadFromXML(Callback1<XmlIO> xmlize, const String& xml)
+bool DoTryLoadFromXML(Event<XmlIO> xmlize, const String& xml)
 {
 	return LoadFromXML0(xmlize, xml);
 }
@@ -211,19 +211,19 @@ static String sXMLFile(const char *file)
 	return file ? String(file) : ConfigFile(GetExeTitle() + ".xml");
 }
 
-bool StoreAsXMLFile(Callback1<XmlIO> xmlize, const char *name, const char *file)
+bool StoreAsXMLFile(Event<XmlIO> xmlize, const char *name, const char *file)
 {
-	return SaveFile(sXMLFile(file), StoreAsXML(xmlize, name ? (String)name : GetExeTitle()));
+	return SaveFile(sXMLFile(file), DoStoreAsXML(xmlize, name ? (String)name : GetExeTitle()));
 }
 
-bool LoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file)
+bool LoadFromXMLFile(Event<XmlIO> xmlize, const char *file)
 {
-	return LoadFromXML(xmlize, LoadFile(sXMLFile(file)));
+	return DoLoadFromXML(xmlize, LoadFile(sXMLFile(file)));
 }
 
-bool TryLoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file)
+bool TryLoadFromXMLFile(Event<XmlIO> xmlize, const char *file)
 {
-	return TryLoadFromXML(xmlize, LoadFile(sXMLFile(file)));
+	return DoTryLoadFromXML(xmlize, LoadFile(sXMLFile(file)));
 }
 
 void StoreJsonValue(XmlIO& xio, const Value& v)
diff --git a/uppsrc/Core/Xmlize.h b/uppsrc/Core/Xmlize.h
index b45f7fd83..8fcd6380b 100644
--- a/uppsrc/Core/Xmlize.h
+++ b/uppsrc/Core/Xmlize.h
@@ -231,7 +231,6 @@ void XmlizeIndex(XmlIO& xml, const char *keytag, T& data)
 	if(xml.IsStoring()) {
 		for(int i = 0; i < data.GetCount(); i++)
 			if(!data.IsUnlinked(i)) {
-				//XmlizeStore(xml.Add(keytag), data.GetKey(i)); //FIXME xmlize with hashfn awareness
 				XmlIO io = xml.Add(keytag);
 				XmlizeStore(io, data[i]);
 			}
@@ -239,10 +238,7 @@ void XmlizeIndex(XmlIO& xml, const char *keytag, T& data)
 	else {
 		data.Clear();
 		int i = 0;
-		//while(i < xml->GetCount() - 1 && xml->Node(i).IsTag(keytag) && xml->Node(i + 1).IsTag(valuetag)) {
 		while(i < xml->GetCount() && xml->Node(i).IsTag(keytag)) {
-			//K key;
-			//Xmlize(xml.At(i++), key); //FIXME dexmlize with hashfn awareness
 			K k;
 			XmlIO io = xml.At(i++);
 			Xmlize(io, k);
@@ -261,34 +257,34 @@ struct ParamHelper__ {
 	ParamHelper__(T& data) : data(data) {}
 };
 
-String StoreAsXML(Callback1<XmlIO> xmlize, const char *name);
-bool   LoadFromXML(Callback1<XmlIO> xmlize, const String& xml);
-bool   TryLoadFromXML(Callback1<XmlIO> xmlize, const String& xml);
+String DoStoreAsXML(Event<XmlIO> xmlize, const char *name);
+bool   DoLoadFromXML(Event<XmlIO> xmlize, const String& xml);
+bool   DoTryLoadFromXML(Event<XmlIO> xmlize, const String& xml);
 
 template <class T>
 String StoreAsXML(const T& data, const char *name = NULL)
 {
 	ParamHelper__<T> p(const_cast<T &>(data));
-	return StoreAsXML(callback(&p, &ParamHelper__<T>::Invoke), name);
+	return DoStoreAsXML([&](XmlIO io) { Xmlize(io, const_cast<T &>(data)); }, name);
 }
 
 template <class T>
 bool LoadFromXML(T& data, const String& xml)
 {
 	ParamHelper__<T> p(data);
-	return LoadFromXML(callback(&p, &ParamHelper__<T>::Invoke), xml);
+	return DoLoadFromXML(callback(&p, &ParamHelper__<T>::Invoke), xml);
 }
 
 template <class T>
 bool TryLoadFromXML(T& data, const String& xml)
 {
 	ParamHelper__<T> p(data);
-	return TryLoadFromXML(callback(&p, &ParamHelper__<T>::Invoke), xml);
+	return DoTryLoadFromXML(callback(&p, &ParamHelper__<T>::Invoke), xml);
 }
 
-bool StoreAsXMLFile(Callback1<XmlIO> xmlize, const char *name = NULL, const char *file = NULL);
-bool LoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file = NULL);
-bool TryLoadFromXMLFile(Callback1<XmlIO> xmlize, const char *file = NULL);
+bool StoreAsXMLFile(Event<XmlIO> xmlize, const char *name = NULL, const char *file = NULL);
+bool LoadFromXMLFile(Event<XmlIO> xmlize, const char *file = NULL);
+bool TryLoadFromXMLFile(Event<XmlIO> xmlize, const char *file = NULL);
 
 template <class T>
 bool StoreAsXMLFile(T& data, const char *name = NULL, const char *file = NULL)
diff --git a/uppsrc/Core/ignorelist b/uppsrc/Core/ignorelist
deleted file mode 100644
index df428500a..000000000
--- a/uppsrc/Core/ignorelist
+++ /dev/null
@@ -1,37 +0,0 @@
-init_
-pick_
-WINAPI
-CALLBACK
-_CRTIMP2
-_CRTIMP
-__cdecl
-__fastcall
-WINOLEAPI
-FAR
-NEAR
-__CLR_OR_THIS_CALL
-__inline
-__CRTDECL
-_CRT_INSECURE_DEPRECATE_GLOBALS
-_CRT_INSECURE_DEPRECATE
-_STDEXT
-ISOLATION_AWARE_INLINE
-WINUSERAPI
-WINAPIV
-__in
-__out
-__inout
-_STD
-_MRTIMP2
-FARPROC
-APIENTRY
-_SCL_INSECURE_DEPRECATE
-__thiscall
-_CRTIMP_PURE
-_CRT_JIT_INTRINSIC
-__CLRCALL_OR_CDECL
-_CRTIMP2_PURE_DEBUG_IT
-_CRTIMP2_PURE
-__declspec
-NAMESPACE_UPP
-END_UPP_NAMESPACE
diff --git a/uppsrc/Core/src.tpp/Stream$en-us.tpp b/uppsrc/Core/src.tpp/Stream$en-us.tpp
index f89cf174c..17aa54346 100644
--- a/uppsrc/Core/src.tpp/Stream$en-us.tpp
+++ b/uppsrc/Core/src.tpp/Stream$en-us.tpp
@@ -454,6 +454,13 @@ obtained from the stream, is corrupted and too big and allocating
 that much memory would cause out`-of`-memory situation.&]
 [s3; &]
 [s4;%- &]
+[s5;:Upp`:`:Stream`:`:Skip`(int`):%- [@(0.0.255) int]_[* Skip]([@(0.0.255) int]_[*@3 size])&]
+[s2; Skips [%-*@3 size] bytes in input Stream. This is similar to SeekCur([%-*@3 size]), 
+however it works with Streams that do not support seeking. Returns 
+a number of bytes actually skipped (can be less than required 
+because of EOF).&]
+[s3; &]
+[s4;%- &]
 [s5;:Stream`:`:GetAll`(void`*`,int`):%- [@(0.0.255) bool]_[* GetAll]([@(0.0.255) void]_`*[*@3 d
 ata], [@(0.0.255) int]_[*@3 size])&]
 [s2; Reads [%-*@3 size] bytes from the stream to memory at [%-*@3 data]. 
diff --git a/uppsrc/Core/z.cpp b/uppsrc/Core/z.cpp
index 5faa37537..d6637adcd 100644
--- a/uppsrc/Core/z.cpp
+++ b/uppsrc/Core/z.cpp
@@ -307,7 +307,7 @@ Zlib::~Zlib()
 	Free();
 }
 
-int64 zPress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress, bool gzip, bool compress,
+int64 zPress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool gzip, bool compress,
              dword *crc = NULL, bool hdr = true)
 {
 	Zlib zlib;
@@ -331,95 +331,95 @@ int64 zPress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progre
 	return r;
 }
 
-int64 ZCompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64>progress, bool hdr)
+int64 ZCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64>progress, bool hdr)
 {
 	return zPress(out, in, size, progress, false, true, NULL, hdr);
 }
 
-int64 ZDecompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64>progress, bool hdr)
+int64 ZDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64>progress, bool hdr)
 {
 	return zPress(out, in, size, progress, false, false, NULL, hdr);
 }
 
-int64 ZCompress(Stream& out, Stream& in, EventGate<int64, int64>progress)
+int64 ZCompress(Stream& out, Stream& in, Gate<int64, int64>progress)
 {
 	return ZCompress(out, in, in.GetLeft(), progress);
 }
 
-int64 ZDecompress(Stream& out, Stream& in, EventGate<int64, int64>progress)
+int64 ZDecompress(Stream& out, Stream& in, Gate<int64, int64>progress)
 {
 	return zPress(out, in, in.GetLeft(), progress, false, false);
 }
 
-String ZCompress(const void *data, int64 len, EventGate<int64, int64>progress)
+String ZCompress(const void *data, int64 len, Gate<int64, int64>progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return ZCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String ZCompress(const String& s, EventGate<int64, int64>progress)
+String ZCompress(const String& s, Gate<int64, int64>progress)
 {
 	return ZCompress(~s, s.GetLength(), progress);
 }
 
-String ZDecompress(const void *data, int64 len, EventGate<int64, int64>progress)
+String ZDecompress(const void *data, int64 len, Gate<int64, int64>progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return ZDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String ZDecompress(const String& s, EventGate<int64, int64>progress)
+String ZDecompress(const String& s, Gate<int64, int64>progress)
 {
 	return ZDecompress(~s, s.GetLength(), progress);
 }
 
-int64  GZCompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64>progress)
+int64  GZCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64>progress)
 {
 	return zPress(out, in, size, progress, true, true);
 }
 
-int64  GZDecompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64>progress)
+int64  GZDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64>progress)
 {
 	return zPress(out, in, size, progress, true, false);
 }
 
-int64  GZCompress(Stream& out, Stream& in, EventGate<int64, int64>progress)
+int64  GZCompress(Stream& out, Stream& in, Gate<int64, int64>progress)
 {
 	return GZCompress(out, in, in.GetLeft(), progress);
 }
 
-String GZCompress(const void *data, int len, EventGate<int64, int64>progress)
+String GZCompress(const void *data, int len, Gate<int64, int64>progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return GZCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String GZCompress(const String& s, EventGate<int64, int64>progress)
+String GZCompress(const String& s, Gate<int64, int64>progress)
 {
 	return GZCompress(~s, s.GetCount(), progress);
 }
 
-int64  GZDecompress(Stream& out, Stream& in, EventGate<int64, int64>progress)
+int64  GZDecompress(Stream& out, Stream& in, Gate<int64, int64>progress)
 {
 	return GZDecompress(out, in, in.GetLeft(), progress);
 }
 
-String GZDecompress(const void *data, int len, EventGate<int64, int64>progress)
+String GZDecompress(const void *data, int len, Gate<int64, int64>progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return GZDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String GZDecompress(const String& s, EventGate<int64, int64>progress)
+String GZDecompress(const String& s, Gate<int64, int64>progress)
 {
 	return GZDecompress(~s, s.GetCount(), progress);
 }
 
-bool GZCompressFile(const char *dstfile, const char *srcfile, EventGate<int64, int64>progress)
+bool GZCompressFile(const char *dstfile, const char *srcfile, Gate<int64, int64>progress)
 {
 	FileIn in(srcfile);
 	if(!in)
@@ -433,13 +433,13 @@ bool GZCompressFile(const char *dstfile, const char *srcfile, EventGate<int64, i
 	return !out.IsError();
 }
 
-bool GZCompressFile(const char *srcfile, EventGate<int64, int64>progress)
+bool GZCompressFile(const char *srcfile, Gate<int64, int64>progress)
 {
 	String dstfile = String(srcfile) + ".gz";
 	return GZCompressFile(dstfile, srcfile, progress);
 }
 
-bool GZDecompressFile(const char *dstfile, const char *srcfile, EventGate<int64, int64>progress)
+bool GZDecompressFile(const char *dstfile, const char *srcfile, Gate<int64, int64>progress)
 {
 	FileIn in(srcfile);
 	if(!in)
@@ -453,7 +453,7 @@ bool GZDecompressFile(const char *dstfile, const char *srcfile, EventGate<int64,
 	return !out.IsError();
 }
 
-bool GZDecompressFile(const char *srcfile, EventGate<int64, int64>progress)
+bool GZDecompressFile(const char *srcfile, Gate<int64, int64>progress)
 {
 	String dstfile = srcfile;
 	if(dstfile.EndsWith(".gz"))
@@ -466,9 +466,9 @@ bool GZDecompressFile(const char *srcfile, EventGate<int64, int64>progress)
 	return GZDecompressFile(dstfile, srcfile, progress);
 }
 
-EventGate<int64, int64> AsGate64(Gate2<int, int> gate)
+Gate<int64, int64> AsGate64(Gate2<int, int> gate)
 {
-	EventGate<int64, int64> h;
+	Gate<int64, int64> h;
 	h << [=](int64 a, int64 b) { return gate((int)a, (int)b); };
 	return h;
 }
@@ -502,7 +502,7 @@ String FastDecompress(const String& data)
 }
 
 // following function is used in both plugin/lz4 and plugin/zstd
-void sCompressStreamCopy_(Stream& out, Stream& in, EventGate<int64, int64> progress, Stream& orig_in, int64 insz)
+void sCompressStreamCopy_(Stream& out, Stream& in, Gate<int64, int64> progress, Stream& orig_in, int64 insz)
 {
 	const int CHUNK = 32678;
 	Buffer<byte> b(CHUNK);
diff --git a/uppsrc/Core/z.h b/uppsrc/Core/z.h
index 7449f8d4f..0a7ed0047 100644
--- a/uppsrc/Core/z.h
+++ b/uppsrc/Core/z.h
@@ -45,7 +45,7 @@ class Zlib {
 	void          Init();
 
 public:
-	Callback2<const void *, int> WhenOut;
+	Event<const void *, int>  WhenOut;
 	
 	void Compress();
 	void Decompress();
@@ -120,37 +120,37 @@ public:
 	~ZDecompressStream()                   { Close(); }
 };
 
-int64  CopyStream(Stream& dest, Stream& src, int64 count, EventGate<int64, int64> progress);
+int64  CopyStream(Stream& dest, Stream& src, int64 count, Gate<int64, int64> progress);
 
-int64  ZCompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress = false, bool hdr = true);
-int64  ZCompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String ZCompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String ZCompress(const String& s, EventGate<int64, int64> progress = false);
+int64  ZCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress = Null, bool hdr = true);
+int64  ZCompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String ZCompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String ZCompress(const String& s, Gate<int64, int64> progress = Null);
 
-int64  ZDecompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress = false, bool hdr = true);
-int64  ZDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String ZDecompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String ZDecompress(const String& s, EventGate<int64, int64> progress = false);
+int64  ZDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress = Null, bool hdr = true);
+int64  ZDecompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String ZDecompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String ZDecompress(const String& s, Gate<int64, int64> progress = Null);
 
-int64  GZCompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress = false);
-int64  GZCompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String GZCompress(const void *data, int len, EventGate<int64, int64> progress = false);
-String GZCompress(const String& s, EventGate<int64, int64> progress = false);
+int64  GZCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress = Null);
+int64  GZCompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String GZCompress(const void *data, int len, Gate<int64, int64> progress = Null);
+String GZCompress(const String& s, Gate<int64, int64> progress = Null);
 
-int64  GZDecompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress = false);
-int64  GZDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String GZDecompress(const void *data, int len, EventGate<int64, int64> progress = false);
-String GZDecompress(const String& s, EventGate<int64, int64> progress = false);
+int64  GZDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress = Null);
+int64  GZDecompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String GZDecompress(const void *data, int len, Gate<int64, int64> progress = Null);
+String GZDecompress(const String& s, Gate<int64, int64> progress = Null);
 
-bool   GZCompressFile(const char *dstfile, const char *srcfile, EventGate<int64, int64> progress = false);
-bool   GZCompressFile(const char *srcfile, EventGate<int64, int64> progress = false);
+bool   GZCompressFile(const char *dstfile, const char *srcfile, Gate<int64, int64> progress = Null);
+bool   GZCompressFile(const char *srcfile, Gate<int64, int64> progress = Null);
 
-bool   GZDecompressFile(const char *dstfile, const char *srcfile, EventGate<int64, int64> progress = false);
-bool   GZDecompressFile(const char *srcfile, EventGate<int64, int64> progress = false);
+bool   GZDecompressFile(const char *dstfile, const char *srcfile, Gate<int64, int64> progress = Null);
+bool   GZDecompressFile(const char *srcfile, Gate<int64, int64> progress = Null);
 
 /// Backward compatibility:
 
-EventGate<int64, int64> AsGate64(Gate2<int, int> gate);
+Gate<int64, int64> AsGate64(Gate2<int, int> gate);
 
 inline int ZCompress(Stream& out, Stream& in, Gate2<int, int> progress)        { return (int)ZCompress(out, in, AsGate64(progress)); }
 inline String ZCompress(const void *data, int len, Gate2<int, int> progress)   { return ZCompress(data, len, AsGate64(progress)); }
diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h
index 0a70358ed..7a8158ad9 100644
--- a/uppsrc/CppBase/CppBase.h
+++ b/uppsrc/CppBase/CppBase.h
@@ -250,7 +250,7 @@ class Lex {
 	void ThrowError(const char *e);
 
 public:
-	Callback1<const String&> WhenError;
+	Event<const String&> WhenError;
 
 	struct Grounding {};
 
@@ -503,7 +503,7 @@ struct Parser {
 	bool        inbody;
 	int         struct_level;
 
-	Callback2<int, const String&> err;
+	Event<int, const String&> err;
 
 	int     lpos, line;
 
@@ -600,7 +600,7 @@ public:
 
 	bool                      IsInBody() const                   { return inbody; }
 
-	typedef Callback1<const FunctionStat &> FnEndCallback;
+	typedef Event<const FunctionStat &> FnEndCallback;
 
 	bool                      dobody;
 	String                    current_scope;
@@ -627,7 +627,7 @@ public:
 	Vector<String> GetNamespaces() const;
 
 	void  Do(Stream& in, CppBase& _base, int file, int filetype,
-	         const String& title, Callback2<int, const String&> _err,
+	         const String& title, Event<int, const String&> _err,
 	         const Vector<String>& typenames,
 	         const Vector<String>& namespace_stack,
 	         const Index<String>& namespace_using);
diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp
index 0f9ca4528..f2fee3c0b 100644
--- a/uppsrc/CppBase/Parser.cpp
+++ b/uppsrc/CppBase/Parser.cpp
@@ -1754,7 +1754,7 @@ void Parser::Do()
 }
 
 void  Parser::Do(Stream& in, CppBase& _base, int filei_, int filetype_,
-                 const String& title_, Callback2<int, const String&> _err,
+                 const String& title_, Event<int, const String&> _err,
                  const Vector<String>& typenames,
                  const Vector<String>& namespace_stack,
                  const Index<String>& namespace_using)
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 12318c4a4..91bb0e703 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -880,7 +880,7 @@ public:
 
 	virtual String GetDesc() const;
 
-	Callback       WhenAction;
+	Event<>        WhenAction;
 
 	void             AddChild(Ctrl *child);
 	void             AddChild(Ctrl *child, Ctrl *insafter);
@@ -1138,9 +1138,9 @@ public:
 	const Value& operator<<=(const Value& v)   { SetData(v); return v; }
 	bool         IsNullInstance() const        { return GetData().IsNull(); }
 
-	Callback     operator<<=(Callback action)  { WhenAction = action; return action; }
+	Callback     operator<<=(Callback  action) { WhenAction = action; return action; }
 
-	Callback&    operator<<(Function<void ()> action)  { return WhenAction << action; }
+	Event<>&     operator<<(Event<> action)    { return WhenAction << action; }
 
 	void    SetTimeCallback(int delay_ms, Function<void ()> cb, int id = 0);
 	void    KillTimeCallback(int id = 0);
@@ -1497,8 +1497,8 @@ protected:
 	virtual void    DrawRect(Rect r1, Rect r2);
 
 public:
-	Callback1<Rect>  sync;
-	Callback1<Rect&> round;
+	Event<Rect>  sync;
+	Event<Rect&> round;
 
 	RectTracker&    SetCursorImage(const Image& m) { cursorimage = m; return *this; }
 	RectTracker&    MinSize(Size sz)               { minsize = sz; return *this; }
diff --git a/uppsrc/CtrlCore/CtrlMt.cpp b/uppsrc/CtrlCore/CtrlMt.cpp
index c0e158bc9..ae18975fa 100644
--- a/uppsrc/CtrlCore/CtrlMt.cpp
+++ b/uppsrc/CtrlCore/CtrlMt.cpp
@@ -59,7 +59,7 @@ void WakeUpGuiThread();
 
 struct Ctrl::CallBox {
 	Semaphore sem;
-	Callback  cb;
+	Event<>   cb;
 };
 
 void Ctrl::PerformCall(Ctrl::CallBox *cbox)
diff --git a/uppsrc/CtrlCore/CtrlTimer.cpp b/uppsrc/CtrlCore/CtrlTimer.cpp
index aadcdfa4b..bd1af5113 100644
--- a/uppsrc/CtrlCore/CtrlTimer.cpp
+++ b/uppsrc/CtrlCore/CtrlTimer.cpp
@@ -10,7 +10,7 @@ int MemoryProbeInt;
 struct TimeEvent : public Link<TimeEvent> {
 	dword      time;
 	int        delay;
-	Callback   cb;
+	Event<>    cb;
 	void      *id;
 	bool       rep;
 };
@@ -29,7 +29,7 @@ static TimeEvent *tevents() {
 	return t.GetPtr();
 }
 
-static void sTimeCallback(dword time, int delay, Callback cb, void *id) {
+static void sTimeCallback(dword time, int delay, Event<>  cb, void *id) {
 	TimeEvent *ne = tevents()->InsertPrev();
 	ne->time = time;
 	ne->cb = cb;
@@ -43,7 +43,7 @@ void SetTimeCallback(int delay_ms, Function<void ()> cb, void *id) {
 	Mutex::Lock __(sTimerLock);
 	ASSERT(abs(delay_ms) < 0x40000000);
 	LLOG("SetTimeCallback " << delay_ms << " " << id);
-	sTimeCallback(GetTickCount() + abs(delay_ms), delay_ms, Callback() << cb, id);
+	sTimeCallback(GetTickCount() + abs(delay_ms), delay_ms, Event<> () << cb, id);
 }
 
 void KillTimeCallbacks(void *id, void *idlim) {
@@ -114,7 +114,7 @@ void Ctrl::TimerProc(dword time)
 		if(!todo)
 			break;
 		LLOG("Performing " << todo->time << " " << todo->delay << " " << todo->id);
-		Callback cb = todo->cb;
+		Event<>  cb = todo->cb;
 		if(todo->delay < 0)
 			todo->rep = true;
 		else
diff --git a/uppsrc/CtrlCore/GtkCtrl.h b/uppsrc/CtrlCore/GtkCtrl.h
index c2fc87b36..0703f04c6 100644
--- a/uppsrc/CtrlCore/GtkCtrl.h
+++ b/uppsrc/CtrlCore/GtkCtrl.h
@@ -164,7 +164,7 @@ public: // really private:
 	static Gclipboard& gselection();
 	static String      RenderPrimarySelection(const Value& fmt);
 
-	static Vector<Callback> hotkey;
+	static Vector<Event<> > hotkey;
 	static Vector<dword>    keyhot;
 	static Vector<dword>    modhot;
             
diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp
index b06e5667f..1101f4a9e 100644
--- a/uppsrc/CtrlCore/GtkWnd.cpp
+++ b/uppsrc/CtrlCore/GtkWnd.cpp
@@ -6,7 +6,7 @@ namespace Upp {
 
 #define LLOG(x)   // DLOG(x)
 
-Vector<Callback>  Ctrl::hotkey;
+Vector<Event<> >  Ctrl::hotkey;
 Vector<dword>     Ctrl::keyhot;
 Vector<dword>     Ctrl::modhot;
 
@@ -122,7 +122,7 @@ Ctrl *Ctrl::GetActiveCtrl()
 	return activeCtrl;
 }
 
-// Vector<Callback> Ctrl::hotkey;
+// Vector<Event<> > Ctrl::hotkey;
 
 #ifndef GDK_WINDOWING_X11
 
diff --git a/uppsrc/CtrlCore/GtkX11Util.cpp b/uppsrc/CtrlCore/GtkX11Util.cpp
index 2db03ac7c..864f26121 100644
--- a/uppsrc/CtrlCore/GtkX11Util.cpp
+++ b/uppsrc/CtrlCore/GtkX11Util.cpp
@@ -128,7 +128,7 @@ int Ctrl::RegisterSystemHotKey(dword key, Function<void ()> cb)
 			q = i;
 			break;
 		}
-	hotkey.At(q) = Callback() << cb;
+	hotkey.At(q) = Event<> () << cb;
 	keyhot.At(q) = k;
 	modhot.At(q) = mod;
 	return q;
diff --git a/uppsrc/CtrlCore/TopWindow.h b/uppsrc/CtrlCore/TopWindow.h
index 57501e91c..1701fcc90 100644
--- a/uppsrc/CtrlCore/TopWindow.h
+++ b/uppsrc/CtrlCore/TopWindow.h
@@ -93,7 +93,7 @@ private:
 public:
 	virtual     void ShutdownWindow();
 
-	Callback    WhenClose;
+	Event<>     WhenClose;
 
 	void        Backup();
 	void        Restore();
diff --git a/uppsrc/CtrlCore/Win32Ctrl.h b/uppsrc/CtrlCore/Win32Ctrl.h
index 0259eeb6d..b0faa982d 100644
--- a/uppsrc/CtrlCore/Win32Ctrl.h
+++ b/uppsrc/CtrlCore/Win32Ctrl.h
@@ -48,7 +48,7 @@ protected:
 	Image DoMouse(int e, Point p, int zd = 0);
 	static void sProcessMSG(MSG& msg);
 
-	static  Vector<Callback> hotkey;
+	static  Vector<Event<> > hotkey;
 
 	friend void sSetCursor(Ctrl *ctrl, const Image& m);
 	
diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp
index c84faf7f8..9ec7ae87e 100644
--- a/uppsrc/CtrlCore/Win32Wnd.cpp
+++ b/uppsrc/CtrlCore/Win32Wnd.cpp
@@ -714,7 +714,7 @@ bool PassWindowsKey(int wParam)
 	||     wParam >= 0x90; // OEM keys
 }
 
-Vector<Callback> Ctrl::hotkey;
+Vector<Event<> > Ctrl::hotkey;
 
 int Ctrl::RegisterSystemHotKey(dword key, Function<void ()> cb)
 {
@@ -725,7 +725,7 @@ int Ctrl::RegisterSystemHotKey(dword key, Function<void ()> cb)
 			q = i;
 			break;
 		}
-	hotkey.At(q) = Callback() << cb;
+	hotkey.At(q) = Event<> () << cb;
 	dword mod = 0;
 	if(key & K_ALT)
 		mod |= MOD_ALT;
diff --git a/uppsrc/CtrlCore/X11Ctrl.h b/uppsrc/CtrlCore/X11Ctrl.h
index 5ddd810f5..759bc4fd3 100644
--- a/uppsrc/CtrlCore/X11Ctrl.h
+++ b/uppsrc/CtrlCore/X11Ctrl.h
@@ -34,7 +34,7 @@ private:
 	       XWindow *GetXWindow();
 	static void     SyncMousePos();
 	static void     ReleaseGrab();
-	static Vector<Callback> hotkey;
+	static Vector<Event<> > hotkey;
 	static Vector<dword> modhot;
 	static Vector<dword> keyhot;
 
diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp
index 50606b64a..85ced72c2 100644
--- a/uppsrc/CtrlCore/X11Wnd.cpp
+++ b/uppsrc/CtrlCore/X11Wnd.cpp
@@ -173,7 +173,7 @@ dword X11mods(dword key)
 	return mod;
 }
 
-Vector<Callback> Ctrl::hotkey;
+Vector<Event<> > Ctrl::hotkey;
 Vector<dword> Ctrl::keyhot;
 Vector<dword> Ctrl::modhot;
 
diff --git a/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp b/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp
index ad2feac8d..367a21a9f 100644
--- a/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp
+++ b/uppsrc/CtrlCore/src.tpp/TopWindow$en-us.tpp
@@ -97,7 +97,9 @@ workspace. Exceeding parts are trimmed (decreasing window size).&]
 [s5;:TopWindow`:`:Breaker`(int`):%- [_^Callback^ Callback]_[* Breaker]([@(0.0.255) int]_[*@3 I
 D]_`=_IDEXIT)&]
 [s2; Returns Callback that, when invoked, invokes [* Break] with the 
-specified exit code.&]
+specified exit code. Note that Callback as return value is used 
+for backward compatibility with pre`-C`+`+11 U`+`+ and for practical 
+purposes, you could consider Event<> being returned.&]
 [s7; [%-*C@3 ID]-|Message loop exit code.&]
 [s7; [*/ Return value]-|Callback.&]
 [s3; &]
@@ -105,7 +107,9 @@ specified exit code.&]
 [s5;:TopWindow`:`:Acceptor`(int`):%- [_^Callback^ Callback]_[* Acceptor]([@(0.0.255) int]_[*@3 I
 D])&]
 [s2; Returns Callback that, when invoked, invokes [* AcceptBreak] with 
-the specified exit code.&]
+the specified exit code. Note that Callback as return value is 
+used for backward compatibility with pre`-C`+`+11 U`+`+ and for 
+practical purposes, you could consider Event<> being returned.&]
 [s7; [%-*C@3 ID]-|Message loop exit code.&]
 [s7; [*/ Return value]-|Callback.&]
 [s3; &]
@@ -113,7 +117,9 @@ the specified exit code.&]
 [s5;:TopWindow`:`:Rejector`(int`):%- [_^Callback^ Callback]_[* Rejector]([@(0.0.255) int]_[*@3 I
 D])&]
 [s2; Returns Callback that, when invoked, invokes [* RejectBreak] with 
-the specified exit code.&]
+the specified exit code. Note that Callback as return value is 
+used for backward compatibility with pre`-C`+`+11 U`+`+ and for 
+practical purposes, you could consider Event<> being returned.&]
 [s7; [%-*C@3 ID]-|Message loop exit code.&]
 [s7; [*/ Return value]-|Callback.&]
 [s3; &]
diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index ccbaba7b4..705c4aa16 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -62,7 +62,7 @@ ArrayCtrl::Column& ArrayCtrl::Column::SetDisplay(const Display& d)
 	return *this;
 }
 
-ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback2<int, One<Ctrl>&> _factory)
+ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Event<int, One<Ctrl>&> _factory)
 {
 	factory = _factory;
 	arrayctrl->hasctrls = arrayctrl->headerctrls = true;
@@ -72,15 +72,9 @@ ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback2<int, One<Ctrl>&> _factory)
 	return *this;
 }
 
-void ArrayCtrl::Column::Factory1(int, One<Ctrl>& x)
-{
-	factory1(x);
-}
-
 ArrayCtrl::Column& ArrayCtrl::Column::Ctrls(Callback1<One<Ctrl>&> _factory)
 {
-	factory1 = _factory;
-	return Ctrls(THISBACK(Factory1));
+	return Ctrls([=](int, One<Ctrl>& x) { _factory(x); });
 }
 
 void ArrayCtrl::Column::ClearCache() {
@@ -3015,7 +3009,7 @@ ArrayCtrl::ArrayCtrl() {
 	header.WhenScroll = THISBACK(HeaderScroll);
 	sb.WhenScroll = THISBACK(Scroll);
 	header.Moving();
-	WhenAcceptRow = true;
+	WhenAcceptRow = [] { return true; };
 	WhenBar = THISBACK(StdBar);
 	SetFrame(ViewFrame());
 	oddpaper = evenpaper = SColorPaper;
diff --git a/uppsrc/CtrlLib/ArrayCtrl.h b/uppsrc/CtrlLib/ArrayCtrl.h
index cd3b71e0c..0c2faad02 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.h
+++ b/uppsrc/CtrlLib/ArrayCtrl.h
@@ -1,8 +1,7 @@
-
 template <class T>
 void DefaultCtrlFactoryFn(One<Ctrl>& ctrl)
 {
-	ctrl = new T;
+	ctrl.Create<T>();
 }
 
 template <class T>
@@ -60,8 +59,8 @@ public:
 		const Convert        *convert;
 		Ptr<Ctrl>             edit;
 		const Display        *display;
-		Callback2<int, One<Ctrl>&> factory;
-		Callback1< One<Ctrl>& > factory1;
+		Event<int, One<Ctrl>&> factory;
+		Event<One<Ctrl>&>     factory1;
 		int                 (*accel)(int);
 		int                   margin;
 		bool                  cached;
@@ -77,7 +76,6 @@ public:
 		void   RemoveCache(int i);
 		void   ClearCache();
 		void   Sorts();
-		void   Factory1(int, One<Ctrl>& ctrl);
 		
 		typedef Column CLASSNAME;
 
@@ -94,12 +92,12 @@ public:
 		Column& SetDisplay(const Display& d);
 		Column& NoEdit();
 		Column& Edit(Ctrl& e);
-		Column& Ctrls(Callback1<One<Ctrl>&> factory);
-		Column& Ctrls(void (*factory)(One<Ctrl>&)) { return Ctrls(callback(factory)); }
+		Column& Ctrls(Callback1<One<Ctrl>&> factory); // deprecated
+		Column& Ctrls(void (*factory)(One<Ctrl>&)) { return Ctrls(Event<int, One<Ctrl>&>([=](int, One<Ctrl>& h) { factory(h); })); }
 		template <class T>
 		Column& Ctrls()                            { return Ctrls(DefaultCtrlFactory<T>()); }
-		Column& Ctrls(Callback2<int, One<Ctrl>&> factory);
-		Column& Ctrls(void (*factory)(int, One<Ctrl>&)) { return Ctrls(callback(factory)); }
+		Column& Ctrls(Event<int, One<Ctrl>&> factory);
+		Column& Ctrls(void (*factory)(int, One<Ctrl>&)) { return Ctrls(Event<int, One<Ctrl>&>([=](int a, One<Ctrl>& b){ factory(a, b); })); }
 		Column& InsertValue(const Value& v);
 		Column& InsertValue(ValueGen& g);
 		Column& NoClickEdit()                      { clickedit = false; return *this; }
@@ -343,36 +341,36 @@ protected:
 	void   ClearModify();
 
 public:
-	Callback          WhenSel; // the most usual ArrayCtrl callbak
+	Event<>           WhenSel; // the most usual ArrayCtrl callbak
 
-	Callback          WhenLeftDouble;
-	Callback1<Point>  WhenMouseMove;
-	Callback          WhenEnterKey;
-	Callback          WhenLeftClick;
-	Callback1<Bar&>   WhenBar;
-	Gate              WhenAcceptRow;
-	Callback          WhenUpdateRow;
-	Callback          WhenArrayAction;
-	Callback          WhenStartEdit;
-	Callback          WhenAcceptEdit;
-	Callback          WhenCtrlsAction;
-	Callback          WhenScroll;
-	Callback          WhenHeaderLayout;
+	Event<>           WhenLeftDouble;
+	Event<Point>      WhenMouseMove;
+	Event<>           WhenEnterKey;
+	Event<>           WhenLeftClick;
+	Event<Bar&>       WhenBar;
+	Gate<>            WhenAcceptRow;
+	Event<>           WhenUpdateRow;
+	Event<>           WhenArrayAction;
+	Event<>           WhenStartEdit;
+	Event<>           WhenAcceptEdit;
+	Event<>           WhenCtrlsAction;
+	Event<>           WhenScroll;
+	Event<>           WhenHeaderLayout;
 
-	Callback2<int, bool&> WhenLineEnabled;
-	Callback2<int, bool&> WhenLineVisible;
+	Event<int, bool&> WhenLineEnabled;
+	Event<int, bool&> WhenLineVisible;
 
-	Callback                        WhenDrag;
-	Callback3<int, int, PasteClip&> WhenDropCell;
-	Callback2<int, PasteClip&>      WhenDropInsert;
-	Callback2<int, PasteClip&>      WhenDropLine;
-	Callback1<PasteClip&>           WhenDrop;
+	Event<>                     WhenDrag;
+	Event<int, int, PasteClip&> WhenDropCell;
+	Event<int, PasteClip&>      WhenDropInsert;
+	Event<int, PasteClip&>      WhenDropLine;
+	Event<PasteClip&>           WhenDrop;
 
 	//Deprecated - use WhenSel
-	Callback          WhenEnterRow;
-	Callback          WhenKillCursor;
-	Callback          WhenCursor;
-	Callback          WhenSelection;
+	Event<>           WhenEnterRow;
+	Event<>           WhenKillCursor;
+	Event<>           WhenCursor;
+	Event<>           WhenSelection;
 
 	IdInfo&    IndexInfo(int ii);
 	IdInfo&    IndexInfo(const Id& id);
@@ -738,9 +736,9 @@ public:
 	void               Click();
 
 public:
-	Callback           WhenAction;
+	Event<>            WhenAction;
 
-	Callback           operator <<= (Callback cb)                  { return WhenAction = cb; }
+	Event<>            operator <<= (Event<>  cb)                  { return WhenAction = cb; }
 
 private:
 	Vector<int>        index;
diff --git a/uppsrc/CtrlLib/Bar.cpp b/uppsrc/CtrlLib/Bar.cpp
index 8f09641ef..77956394b 100644
--- a/uppsrc/CtrlLib/Bar.cpp
+++ b/uppsrc/CtrlLib/Bar.cpp
@@ -292,7 +292,7 @@ Bar::Item&  Bar::Add(const char *text, const UPP::Image& image, const Callback&
 	return AddItem(callback).Text(text).Image(image);
 }
 /*
-Bar::Item& Bar::Add(const String& text, const UPP::Image& image, const Callback& callback)
+Bar::Item& Bar::Add(const String& text, const UPP::Image& image, const Event<> & callback)
 {
 	return Add(~text, image, callback);
 }
@@ -305,16 +305,16 @@ Bar::Item&  Bar::Add(KeyInfo& (*key)(), const UPP::Image& image, const Callback&
 	return Add(text, image, callback).Key(key);
 }
 
-Bar::Item&  Bar::Add(bool enable, const char *text, const Callback& callback)
+Bar::Item&  Bar::Add(bool enable, const char *text, const Callback & callback)
 { return IsMenuBar() ? Add(enable, text, Image(), callback) : NilItem(); }
 
-Bar::Item&  Bar::Add(const char *text, const Callback& callback)
+Bar::Item&  Bar::Add(const char *text, const Callback & callback)
 { return IsMenuBar() ? Add(true, text, Image(), callback) : NilItem(); }
 
-Bar::Item&  Bar::Add(bool enable, KeyInfo& (*key)(), const Callback& callback)
+Bar::Item&  Bar::Add(bool enable, KeyInfo& (*key)(), const Callback & callback)
 { return IsMenuBar() ? Add(enable, key, Image(), callback) : NilItem(); }
 
-Bar::Item&  Bar::Add(KeyInfo& (*key)(), const Callback& callback)
+Bar::Item&  Bar::Add(KeyInfo& (*key)(), const Callback & callback)
 { return IsMenuBar() ? Add(true, key, Image(), callback) : NilItem(); }
 
 Bar::Item& Bar::Add(bool enable, const char *text, const UPP::Image& image, const UPP::Function<void ()>& fn)
@@ -335,7 +335,7 @@ Bar::Item& Bar::Add(const char *text, const UPP::Image& image, const Function<vo
 /*
 Bar::Item& Bar::Add(const String& text, const UPP::Image& image, const Function<void ()>& fn)
 {
-	return Add(text, image, Callback() << fn);
+	return Add(text, image, Event<> () << fn);
 }
 */
 
@@ -380,16 +380,16 @@ void   Bar::MenuGap(int size)            { if(IsMenuBar()) Gap(size); }
 void   Bar::AddMenu(Ctrl& ctrl)          { if(IsMenuBar()) Add(ctrl); }
 void   Bar::AddMenu(Ctrl& ctrl, Size sz) { if(IsMenuBar()) Add(ctrl, sz); }
 
-Bar::Item&  Bar::AddMenu(bool enable, KeyInfo& (*key)(), const UPP::Image& image, const Callback& callback)
+Bar::Item&  Bar::AddMenu(bool enable, KeyInfo& (*key)(), const UPP::Image& image, const Callback & callback)
 { return IsMenuBar() ? Add(enable, key, image, callback) : NilItem(); }
 
-Bar::Item&  Bar::AddMenu(KeyInfo& (*key)(), const UPP::Image& image, const Callback& callback)
+Bar::Item&  Bar::AddMenu(KeyInfo& (*key)(), const UPP::Image& image, const Callback & callback)
 { return IsMenuBar() ? Add(key, image, callback) : NilItem(); }
 
-Bar::Item&  Bar::AddMenu(bool enable, const char *text, const UPP::Image& image, const Callback& callback)
+Bar::Item&  Bar::AddMenu(bool enable, const char *text, const UPP::Image& image, const Callback & callback)
 { return IsMenuBar() ? Add(enable, text, image, callback) : NilItem(); }
 
-Bar::Item&  Bar::AddMenu(const char *text, const UPP::Image& image, const Callback& callback)
+Bar::Item&  Bar::AddMenu(const char *text, const UPP::Image& image, const Callback & callback)
 { return IsMenuBar() ? Add(text, image, callback) : NilItem(); }
 
 
@@ -400,49 +400,49 @@ Bar::Item& Bar::AddMenu(bool enable, const char *text, const UPP::Image& image,
 
 Bar::Item& Bar::AddMenu(bool enable, KeyInfo& (*key)(), const UPP::Image& image, const Function<void ()>& fn)
 {
-	return AddMenu(enable, key, image, Callback() << fn);
+	return AddMenu(enable, key, image, Callback () << fn);
 }
 
 Bar::Item& Bar::AddMenu(const char *text, const UPP::Image& image, const Function<void ()>& fn)
 {
-	return AddMenu(text, image, Callback() << fn);
+	return AddMenu(text, image, Callback () << fn);
 }
 
 Bar::Item& Bar::AddMenu(KeyInfo& (*key)(), const UPP::Image& m, const Function<void ()>& fn)
 {
-	return AddMenu(key, m, Callback() << fn);
+	return AddMenu(key, m, Callback () << fn);
 }
 
-Bar::Item& Bar::Add(bool enable, const char *text, const Event<Bar&>& proc)
+Bar::Item& Bar::Add(bool enable, const char *text, const Callback1<Bar&>& proc)
 { return AddSubMenu(proc).Text(text).Enable(enable); }
 
-Bar::Item& Bar::Add(const char *text, const Event<Bar&>& proc)
+Bar::Item& Bar::Add(const char *text, const Callback1<Bar&>& proc)
 { return Add(true, text, proc); }
 
-Bar::Item& Bar::Add(bool enable, const char *text, const UPP::Image& image, const Event<Bar&>& proc)
+Bar::Item& Bar::Add(bool enable, const char *text, const UPP::Image& image, const Callback1<Bar&>& proc)
 { return Add(enable, text, proc).Image(image); }
 
-Bar::Item& Bar::Add(const char *text, const UPP::Image& image, const Event<Bar&>& proc)
+Bar::Item& Bar::Add(const char *text, const UPP::Image& image, const Callback1<Bar&>& proc)
 { return Add(text, proc).Image(image); }
 
 Bar::Item& Bar::Sub(bool enable, const char *text, const Function<void (Bar&)>& submenu)
 {
-	return Add(enable, text, Event<Bar&>() << submenu);
+	return Add(enable, text, Callback1<Bar&>() << submenu);
 }
 
 Bar::Item& Bar::Sub(const char *text, const Function<void (Bar&)>& submenu)
 {
-	return Add(text, Event<Bar&>() << submenu);
+	return Add(text, Callback1<Bar&>() << submenu);
 }
 
 Bar::Item& Bar::Sub(bool enable, const char *text, const UPP::Image& image, const Function<void (Bar&)>& submenu)
 {
-	return Add(enable, text, image, Event<Bar&>() << submenu);
+	return Add(enable, text, image, Callback1<Bar&>() << submenu);
 }
 
 Bar::Item& Bar::Sub(const char *text, const UPP::Image& image, const Function<void (Bar&)>& submenu)
 {
-	return Add(text, image, Event<Bar&>() << submenu);
+	return Add(text, image, Callback1<Bar&>() << submenu);
 }
 
 void   Bar::ToolSeparator()                { if(IsToolBar()) Separator(); }
@@ -452,9 +452,9 @@ void   Bar::ToolGap(int size)              { if(IsToolBar()) Gap(size); }
 void   Bar::AddTool(Ctrl& ctrl)            { if(IsToolBar()) Add(ctrl); }
 void   Bar::AddTool(Ctrl& ctrl, Size sz)   { if(IsToolBar()) Add(ctrl, sz); }
 
-void   Bar::AddKey(dword key, Callback cb) {}
+void   Bar::AddKey(dword key, Event<>  cb) {}
 
-void Bar::AddKey(KeyInfo& (*key)(), Callback cb)
+void Bar::AddKey(KeyInfo& (*key)(), Event<>  cb)
 {
 	KeyInfo& k = (*key)();
 	AddKey(k.key[0], cb);
@@ -463,17 +463,17 @@ void Bar::AddKey(KeyInfo& (*key)(), Callback cb)
 	AddKey(k.key[3], cb);
 }
 
-Bar::Item&  Bar::Add(bool enable, const UPP::Image& image, Callback cb)
+Bar::Item&  Bar::Add(bool enable, const UPP::Image& image, Event<>  cb)
 { return IsToolBar() ? AddItem(cb).Image(image).Enable(enable) : NilItem(); }
 
-Bar::Item&  Bar::Add(const UPP::Image& image, Callback cb)
+Bar::Item&  Bar::Add(const UPP::Image& image, Event<>  cb)
 { return IsToolBar() ? Add(true, image, cb) : NilItem(); }
 
 class Bar::ScanKeys : public Bar {
 	struct KeyItem : public Bar::Item {
 		bool          enabled;
 		Vector<dword> key;
-		Callback      action;
+		Event<>       action;
 
 		virtual Item& Text(const char *)             { return *this; }
 		virtual Item& Check(bool check)              { return *this; }
@@ -492,8 +492,8 @@ class Bar::ScanKeys : public Bar {
 	int            level;
 
 protected:
-	virtual Item&  AddItem(Callback cb);
-	virtual Item&  AddSubMenu(Callback1<Bar&> proc);
+	virtual Item&  AddItem(Event<>  cb);
+	virtual Item&  AddSubMenu(Event<Bar&> proc);
 	virtual void   AddCtrl(Ctrl *ctrl, int gapsize) {};
 	virtual void   AddCtrl(Ctrl *ctrl, Size sz) {};
 
@@ -504,14 +504,14 @@ public:
 
 	virtual bool   IsEmpty() const                   { return key.IsEmpty(); }
 	virtual void   Separator()                       {}
-	virtual void   AddKey(dword key, Callback cb);
+	virtual void   AddKey(dword key, Event<>  cb);
 
 	bool Do(dword key);
 
 	ScanKeys()                                       { level = 0; }
 };
 
-Bar::Item& Bar::ScanKeys::AddItem(Callback cb)
+Bar::Item& Bar::ScanKeys::AddItem(Event<>  cb)
 {
 	KeyItem& m = key.Add();
 	m.action = cb;
@@ -519,7 +519,7 @@ Bar::Item& Bar::ScanKeys::AddItem(Callback cb)
 	return m;
 }
 
-Bar::Item&  Bar::ScanKeys::AddSubMenu(Callback1<Bar&> proc)
+Bar::Item&  Bar::ScanKeys::AddSubMenu(Event<Bar&> proc)
 {
 	level++;
 	if(level > 5)
@@ -529,7 +529,7 @@ Bar::Item&  Bar::ScanKeys::AddSubMenu(Callback1<Bar&> proc)
 	return key.GetCount() ? key.Top() : nilitem;
 }
 
-void   Bar::ScanKeys::AddKey(dword _key, Callback cb)
+void   Bar::ScanKeys::AddKey(dword _key, Event<>  cb)
 {
 	if(_key) {
 		KeyItem& m = key.Add();
@@ -551,7 +551,7 @@ bool   Bar::ScanKeys::Do(dword k)
 	return false;
 }
 
-bool   Bar::Scan(Callback1<Bar&> proc, dword key)
+bool   Bar::Scan(Event<Bar&> proc, dword key)
 {
 	ScanKeys keys;
 	proc(keys);
@@ -742,12 +742,12 @@ void LRUList::Serialize(Stream& stream)
 	StreamContainer(stream, lru);
 }
 
-void LRUList::Select(String f, Callback1<const String&> WhenSelect)
+void LRUList::Select(String f, Event<const String&> WhenSelect)
 {
 	WhenSelect(f);
 }
 
-void LRUList::operator()(Bar& bar, Callback1<const String&> WhenSelect)
+void LRUList::operator()(Bar& bar, Event<const String&> WhenSelect)
 {
 	if(bar.IsMenuBar() && !lru.IsEmpty()) {
 		bar.Separator();
diff --git a/uppsrc/CtrlLib/Bar.h b/uppsrc/CtrlLib/Bar.h
index cc79eadbd..58e7b2026 100644
--- a/uppsrc/CtrlLib/Bar.h
+++ b/uppsrc/CtrlLib/Bar.h
@@ -21,7 +21,7 @@ private:
 	int&     VeHo(bool horz, Size& sz) const { return horz ? sz.cy : sz.cx; }
 
 public:
-	Callback WhenLeftClick;
+	Event<>  WhenLeftClick;
 
 	void  PaintBar(Draw& w, const SeparatorCtrl::Style& ss,
 	               const Value& pane, const Value& iconbar = Null, int iconsz = 0);
@@ -74,8 +74,8 @@ public:
 	};
 
 protected:
-	virtual Item&  AddItem(Callback cb) = 0;
-	virtual Item&  AddSubMenu(Callback1<Bar&> proc) = 0;
+	virtual Item&  AddItem(Event<>  cb) = 0;
+	virtual Item&  AddSubMenu(Event<Bar&> proc) = 0;
 	virtual void   AddCtrl(Ctrl *ctrl, int gapsize) = 0;
 	virtual void   AddCtrl(Ctrl *ctrl, Size sz) = 0;
 
@@ -86,7 +86,7 @@ public:
 	virtual void   Separator() = 0;
 
 	static  Item&  NilItem();
-	static bool    Scan(Callback1<Bar&> proc, dword key);
+	static bool    Scan(Event<Bar&> proc, dword key);
 
 	void   Break();
 	void   Gap(int size = 8);
@@ -153,14 +153,14 @@ public:
 	Item&  AddMenu(const String& text, const UPP::Image& m, const Function<void ()>& fn) { return AddMenu(~text, m, fn); }
 	Item&  AddMenu(KeyInfo& (*key)(), const UPP::Image& m, const Function<void ()>& fn);
 
-	Item&  Add(bool enable, const char *text, const Event<Bar&>& proc);
-	Item&  Add(bool enable, const String& text, const Event<Bar&>& proc) { return Add(enable, ~text, proc); }
-	Item&  Add(const char *text, const Event<Bar&>& proc);
-	Item&  Add(const String& text, const Event<Bar&>& proc) { return Add(~text, proc); }
-	Item&  Add(bool enable, const char *text, const UPP::Image& image, const Event<Bar&>& proc);
-	Item&  Add(bool enable, const String& text, const UPP::Image& image, const Event<Bar&>& proc) { return Add(enable, ~text, proc); }
-	Item&  Add(const char *text, const UPP::Image& image, const Event<Bar&>& proc);
-	Item&  Add(const String& text, const UPP::Image& image, const Event<Bar&>& proc) { return Add(~text, image, proc); }
+	Item&  Add(bool enable, const char *text, const Callback1<Bar&>& proc);
+	Item&  Add(bool enable, const String& text, const Callback1<Bar&>& proc) { return Add(enable, ~text, proc); }
+	Item&  Add(const char *text, const Callback1<Bar&>& proc);
+	Item&  Add(const String& text, const Callback1<Bar&>& proc) { return Add(~text, proc); }
+	Item&  Add(bool enable, const char *text, const UPP::Image& image, const Callback1<Bar&>& proc);
+	Item&  Add(bool enable, const String& text, const UPP::Image& image, const Callback1<Bar&>& proc) { return Add(enable, ~text, proc); }
+	Item&  Add(const char *text, const UPP::Image& image, const Callback1<Bar&>& proc);
+	Item&  Add(const String& text, const UPP::Image& image, const Callback1<Bar&>& proc) { return Add(~text, image, proc); }
 	Item&  Sub(bool enable, const char *text, const Function<void (Bar&)>& submenu);
 	Item&  Sub(bool enable, const String& text, const Function<void (Bar&)>& submenu) { return Sub(enable, ~text, submenu); }
 	Item&  Sub(const char *text, const Function<void (Bar&)>& submenu);
@@ -179,11 +179,11 @@ public:
 	void   AddTool(Ctrl& ctrl, Size sz);
 	void   AddTool(Ctrl& ctrl, int cx, int cy = 0)  { AddTool(ctrl, Size(cx, cy)); }
 
-	Item&  Add(const UPP::Image& image, Callback callback);
-	Item&  Add(bool enable, const UPP::Image& image, Callback callback);
+	Item&  Add(const UPP::Image& image, Event<>  callback);
+	Item&  Add(bool enable, const UPP::Image& image, Event<>  callback);
 
-	virtual void AddKey(dword key, Callback cb);
-	        void AddKey(KeyInfo& (*key)(), Callback cb);
+	virtual void AddKey(dword key, Event<>  cb);
+	        void AddKey(KeyInfo& (*key)(), Event<>  cb);
 
 	virtual bool IsMenuBar() const                  { return false; }
 	virtual bool IsToolBar() const                  { return false; }
@@ -250,8 +250,8 @@ protected:
 	friend class BarPane;
 
 public:
-	Callback1<const String&> WhenHelp;
-	Callback WhenLeftClick;
+	Event<const String&> WhenHelp;
+	Event<>  WhenLeftClick;
 
 	static BarCtrl *GetBarCtrlParent(Ctrl *child);
 	static void     SendHelpLine(Ctrl *q);
@@ -299,8 +299,8 @@ public:
 	virtual bool  IsMenuBar() const                  { return true; }
 
 protected:
-	virtual Item& AddItem(Callback cb);
-	virtual Item& AddSubMenu(Callback1<Bar&> proc);
+	virtual Item& AddItem(Event<>  cb);
+	virtual Item& AddSubMenu(Event<Bar&> proc);
 	virtual Value GetBackground() const;
 
 public:
@@ -362,15 +362,15 @@ protected:
 	};
 
 public:
-	Callback WhenSubMenuOpen;
-	Callback WhenSubMenuClose;
+	Event<>  WhenSubMenuOpen;
+	Event<>  WhenSubMenuClose;
 
 	static int GetStdHeight(Font font = StdFont());
 
 	void     CloseMenu();
 
-	void     Set(Callback1<Bar&> menu);
-	void     Post(Callback1<Bar&> bar);
+	void     Set(Event<Bar&> menu);
+	void     Post(Event<Bar&> bar);
 
 	void     PopUp(Point p)                         { PopUp(GetActiveCtrl(), p); }
 	void     PopUp()                                { PopUp(GetMousePos()); }
@@ -379,9 +379,9 @@ public:
 	void     Execute(Point p)                       { Execute(GetActiveCtrl(), p); }
 	void     Execute()                              { Execute(GetMousePos()); }
 
-	static void Execute(Ctrl *owner, Callback1<Bar&> proc, Point p);
-	static void Execute(Callback1<Bar&> proc, Point p) { Execute(GetActiveCtrl(), proc, p); }
-	static void Execute(Callback1<Bar&> proc)          { Execute(proc, GetMousePos()); }
+	static void Execute(Ctrl *owner, Event<Bar&> proc, Point p);
+	static void Execute(Event<Bar&> proc, Point p) { Execute(GetActiveCtrl(), proc, p); }
+	static void Execute(Event<Bar&> proc)          { Execute(proc, GetMousePos()); }
 
 	bool     IsEmpty() const                         { return item.IsEmpty(); }
 	void     Clear();
@@ -496,8 +496,8 @@ public:
 	virtual void Paint(Draw& w);
 
 protected:
-	virtual Item& AddItem(Callback cb);
-	virtual Item& AddSubMenu(Callback1<Bar&> proc);
+	virtual Item& AddItem(Event<>  cb);
+	virtual Item& AddSubMenu(Event<Bar&> proc);
 
 public:
 	struct Style : ChStyle<Style> {
@@ -514,7 +514,7 @@ private:
 	int               ii;
 	Array<ToolButton> item;
 	int               lock;
-	Callback1<Bar&>   proc;
+	Event<Bar&>   proc;
 	const Style      *style;
 	int               arealook;
 
@@ -535,8 +535,8 @@ public:
 	static int GetStdHeight();
 
 	void Clear();
-	void Set(Callback1<Bar&> bar);
-	void Post(Callback1<Bar&> bar);
+	void Set(Event<Bar&> bar);
+	void Post(Event<Bar&> bar);
 
 	static const Style& StyleDefault();
 
@@ -571,14 +571,14 @@ public:
 class LRUList {
 	Vector<String> lru;
 	int            limit;
-	void           Select(String s, Callback1<const String&> WhenSelect);
+	void           Select(String s, Event<const String&> WhenSelect);
 
 public:
 	static int GetStdHeight();
 
 	void        Serialize(Stream& stream);
 
-	void        operator()(Bar& bar, Callback1<const String&> WhenSelect);
+	void        operator()(Bar& bar, Event<const String&> WhenSelect);
 
 	void        NewEntry(const String& path);
 	void        RemoveEntry(const String& path);
diff --git a/uppsrc/CtrlLib/ColumnList.h b/uppsrc/CtrlLib/ColumnList.h
index 4aa9d6577..7433801a9 100644
--- a/uppsrc/CtrlLib/ColumnList.h
+++ b/uppsrc/CtrlLib/ColumnList.h
@@ -96,21 +96,21 @@ public:
 		MODE_ROWS
 	};
 
-	Callback         WhenLeftClick;
-	Callback1<Point> WhenLeftClickPos;
-	Callback         WhenLeftDouble;
-	Callback1<Bar&>  WhenBar;
-	Callback         WhenSel;
+	Event<>      WhenLeftClick;
+	Event<Point> WhenLeftClickPos;
+	Event<>      WhenLeftDouble;
+	Event<Bar&>  WhenBar;
+	Event<>      WhenSel;
 
-	Callback                     WhenDrag;
-	Callback2<int, PasteClip&>   WhenDropItem;
-	Callback2<int, PasteClip&>   WhenDropInsert;
-	Callback1<PasteClip&>        WhenDrop;
+	Event<>                  WhenDrag;
+	Event<int, PasteClip&>   WhenDropItem;
+	Event<int, PasteClip&>   WhenDropInsert;
+	Event<PasteClip&>        WhenDrop;
 
-	// depracated - use WhenSel
-	Callback         WhenSelection;
-	Callback         WhenEnterItem;
-	Callback         WhenKillCursor;
+	// deprecated - use WhenSel
+	Event<>          WhenSelection;
+	Event<>          WhenEnterItem;
+	Event<>          WhenKillCursor;
 
 	int     GetColumnItems() const;
 	int     GetColumnCx(int i = 0) const;
diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp
index f87b88901..d9fbb3521 100644
--- a/uppsrc/CtrlLib/CtrlUtil.cpp
+++ b/uppsrc/CtrlLib/CtrlUtil.cpp
@@ -254,7 +254,7 @@ bool EditDateDlg(Date& d, const char *title, const char *label, Date min, Date m
 	return false;	
 }
 
-Callback CtrlRetriever::operator<<=(Callback cb)
+Event<>  CtrlRetriever::operator<<=(Event<>  cb)
 {
 	for(int i = 0; i < item.GetCount(); i++) {
 		CtrlItem0 *m = dynamic_cast<CtrlItem0 *>(&item[i]);
diff --git a/uppsrc/CtrlLib/CtrlUtil.h b/uppsrc/CtrlLib/CtrlUtil.h
index 512770d7d..7fbf768bb 100644
--- a/uppsrc/CtrlLib/CtrlUtil.h
+++ b/uppsrc/CtrlLib/CtrlUtil.h
@@ -31,16 +31,16 @@ void WindowsList();
 void WindowsMenu(Bar& bar);
 
 class DelayCallback : public Pte<DelayCallback> {
-	Callback target;
+	Event<>  target;
 	int      delay;
 
 public:
 	void     Invoke();
-	void     operator<<=(Callback x)  { target = x; }
+	void     operator<<=(Event<> x)   { target = x; }
 	void     SetDelay(int ms)         { delay = ms; }
-	Callback Get()                    { return callback(this, &DelayCallback::Invoke); }
-	Callback operator~()              { return Get(); }
-	operator Callback()               { return Get(); }
+	Event<>  Get()                    { return callback(this, &DelayCallback::Invoke); }
+	Event<>  operator~()              { return Get(); }
+	operator Event<>()                { return Get(); }
 
 	DelayCallback()                   { delay = 2000; }
 	~DelayCallback()                  { KillTimeCallback(this); }
@@ -124,14 +124,14 @@ public:
 	virtual void    BalloonHide();
 	virtual void    BalloonTimeout();
 
-	Callback        WhenLeftDown;
-	Callback        WhenLeftUp;
-	Callback        WhenLeftDouble;
-	Callback1<Bar&> WhenBar;
-	Callback        WhenBalloonLeftDown;
-	Callback        WhenBalloonShow;
-	Callback        WhenBalloonHide;
-	Callback        WhenBalloonTimeout;
+	Event<>         WhenLeftDown;
+	Event<>         WhenLeftUp;
+	Event<>         WhenLeftDouble;
+	Event<Bar&> WhenBar;
+	Event<>         WhenBalloonLeftDown;
+	Event<>         WhenBalloonShow;
+	Event<>         WhenBalloonHide;
+	Event<>         WhenBalloonTimeout;
 
 	void            Break()                                { EndLoop(0); }
 	void            Run()                                  { EventLoop(this); }
@@ -181,10 +181,10 @@ public:
 	virtual void    LeftUp();
 	virtual void    LeftDouble();
 
-	Callback        WhenLeftDown;
-	Callback        WhenLeftUp;
-	Callback        WhenLeftDouble;
-	Callback1<Bar&> WhenBar;
+	Event<>         WhenLeftDown;
+	Event<>         WhenLeftUp;
+	Event<>         WhenLeftDouble;
+	Event<Bar&> WhenBar;
 
 	void            Break();
 	void            Run();
@@ -260,14 +260,14 @@ public:
 	virtual void    BalloonHide();
 	virtual void    BalloonTimeout();
 
-	Callback        WhenLeftDown;
-	Callback        WhenLeftUp;
-	Callback        WhenLeftDouble;
-	Callback1<Bar&> WhenBar;
-	Callback        WhenBalloonLeftDown;
-	Callback        WhenBalloonShow;
-	Callback        WhenBalloonHide;
-	Callback        WhenBalloonTimeout;
+	Event<>         WhenLeftDown;
+	Event<>         WhenLeftUp;
+	Event<>         WhenLeftDouble;
+	Event<Bar&> WhenBar;
+	Event<>         WhenBalloonLeftDown;
+	Event<>         WhenBalloonShow;
+	Event<>         WhenBalloonHide;
+	Event<>         WhenBalloonTimeout;
 
 	void            Show(bool b = true);
 	void            Hide()                                 { Show(false); }
@@ -424,7 +424,7 @@ public:
 
 	void Retrieve();
 
-	Callback operator<<=(Callback cb);
+	Event<>  operator<<=(Event<>  cb);
 };
 
 template <class T>
diff --git a/uppsrc/CtrlLib/DateTimeCtrl.cpp b/uppsrc/CtrlLib/DateTimeCtrl.cpp
index a94eac0a4..897ef5da3 100644
--- a/uppsrc/CtrlLib/DateTimeCtrl.cpp
+++ b/uppsrc/CtrlLib/DateTimeCtrl.cpp
@@ -1463,7 +1463,7 @@ void FlatSpin::SetTips(const char *tipl, const char *tipr)
 	right.Tip(tipr);
 }
 
-void FlatSpin::SetCallbacks(const Callback &cbl, const Callback& cbr)
+void FlatSpin::SetCallbacks(const Event<>& cbl, const Event<>& cbr)
 {
 	left.WhenAction = cbl;
 	right.WhenAction = cbr;
diff --git a/uppsrc/CtrlLib/DateTimeCtrl.h b/uppsrc/CtrlLib/DateTimeCtrl.h
index 236134463..3d18e0344 100644
--- a/uppsrc/CtrlLib/DateTimeCtrl.h
+++ b/uppsrc/CtrlLib/DateTimeCtrl.h
@@ -59,7 +59,7 @@ public:
 	FlatSpin();
 	void SetText(const String& s);
 	void SetTips(const char *tipl, const char *tipr);
-	void SetCallbacks(const Callback &cbl, const Callback& cbr);
+	void SetCallbacks(const Event<>& cbl, const Event<>& cbr);
 
 	FlatSpin& Selectable(bool b = true);
 	int GetWidth(const String& s, bool with_buttons = true);
@@ -87,8 +87,8 @@ protected:
 public:
 	PopUpCtrl() : popup(false) {}
 
-	Callback WhenPopDown;
-	Callback WhenDeactivate;
+	Event<>  WhenPopDown;
+	Event<>  WhenDeactivate;
 	virtual void Deactivate();
 	virtual Size ComputeSize() = 0;
 	virtual void Reset() {}
@@ -208,8 +208,8 @@ private:
 
 public:
 	Calendar();
-	Callback1<Time &> WhenTime;
-	Callback1<Date>   WhenWeek;
+	Event<Time &> WhenTime;
+	Event<Date>   WhenWeek;
 
 	static const Style& StyleDefault();
 
@@ -246,7 +246,7 @@ public:
 
 	void PopUp(Ctrl *owner, Rect &rt);
 
-	Callback WhenSelect;
+	Event<>  WhenSelect;
 };
 
 struct LineCtrl : Ctrl
@@ -406,7 +406,7 @@ public:
 	Clock clock;
 
 	CalendarClock(int m = MODE_TIME);
-	Callback WhenPopDown;
+	Event<>  WhenPopDown;
 
 	virtual void Deactivate();
 	virtual bool Key(dword key, int count);
@@ -490,7 +490,7 @@ class DateTimeCtrl : public T {
 
 		}
 		if(WhenWeek)
-			cc.calendar.WhenWeek = Proxy(WhenWeek);
+			cc.calendar.WhenWeek = WhenWeek.Proxy();
 		else
 			cc.calendar.WhenWeek.Clear();
 		cc.PopUp(this, r);
@@ -501,7 +501,7 @@ class DateTimeCtrl : public T {
 public:
 	typedef DateTimeCtrl CLASSNAME;
 	
-	Callback1<Date> WhenWeek;
+	Event<Date> WhenWeek;
 
 	DateTimeCtrl(int m) : cc(m) {
 		drop.AddTo(*this);
@@ -512,7 +512,7 @@ public:
 		cc.calendar   <<= THISBACK(OnCalendarChoice);
 		cc.clock      <<= THISBACK(OnClockChoice);
 		cc.WhenPopDown  = THISBACK(OnClose);
-		cc.calendar.WhenSelect = Proxy(WhenSelect);
+		cc.calendar.WhenSelect = WhenSelect.Proxy();
 	}
 
 	virtual void GotFocus()  { T::GotFocus(); drop.RefreshFrame(); }
@@ -532,7 +532,7 @@ public:
 	DateTimeCtrl& OneButton(bool b = true)                         { cc.calendar.OneButton(true); return *this; }
 	DateTimeCtrl& NoOneButton()                                    { cc.calendar.OneButton(false); return *this; }
 
-	Callback WhenSelect;
+	Event<>  WhenSelect;
 };
 
 class DropDate : public DateTimeCtrl<EditDate>
diff --git a/uppsrc/CtrlLib/DlgColor.h b/uppsrc/CtrlLib/DlgColor.h
index 6c0a28c1f..b8141d8ac 100644
--- a/uppsrc/CtrlLib/DlgColor.h
+++ b/uppsrc/CtrlLib/DlgColor.h
@@ -17,7 +17,7 @@ public:
 	virtual void  LeftDouble(Point pt, dword keyflags);
 	virtual void  MouseMove(Point pt, dword keyflags);
 
-	Callback      WhenLeftDouble;
+	Event<>       WhenLeftDouble;
 
 private:
 	void          SetColor(Color color, bool set_norm, bool set_hsv);
@@ -84,7 +84,7 @@ public:
 	Ctrl&          GetImplCtrl()                            { return impl->GetCtrl(); }
 
 public:
-	Callback       WhenSetColor;
+	Event<>        WhenSetColor;
 
 public:
 	class Impl
@@ -183,8 +183,8 @@ private:
 	friend void ColorPopUp_InitHint();
 
 public:
-	Callback WhenCancel;
-	Callback WhenSelect;
+	Event<>  WhenCancel;
+	Event<>  WhenSelect;
 
 	static void Hint(Color c);
 
diff --git a/uppsrc/CtrlLib/DropChoice.h b/uppsrc/CtrlLib/DropChoice.h
index b496550c4..961dd9e99 100644
--- a/uppsrc/CtrlLib/DropChoice.h
+++ b/uppsrc/CtrlLib/DropChoice.h
@@ -28,8 +28,8 @@ public:
 	void         PopUp(Ctrl *owner, int width);
 	void         PopUp(Ctrl *owner);
 
-	Callback     WhenCancel;
-	Callback     WhenSelect;
+	Event<>      WhenCancel;
+	Event<>      WhenSelect;
 
 	PopUpTable&  SetDropLines(int _droplines)          { droplines = _droplines; return *this; }
 
@@ -72,7 +72,7 @@ private:
 public:
 	typedef MultiButton::Style Style;
 
-	Callback      WhenDrop;
+	Event<>       WhenDrop;
 
 	DropList&     Add(const Value& key, const Value& value, bool enable = true);
 	DropList&     Add(const Value& value)         { return Add(value, value); }
@@ -173,8 +173,8 @@ protected:
 	typedef DropChoice CLASSNAME;
 
 public:
-	Callback    WhenDrop;
-	Callback    WhenSelect;
+	Event<>     WhenDrop;
+	Event<>     WhenSelect;
 
 	bool        DoKey(dword key);
 	void        DoWheel(int zdelta);
@@ -236,8 +236,8 @@ protected:
 	void            DoWhenDrop()                          { WhenDrop(); }
 
 public:
-	Callback        WhenDrop;
-	Callback        WhenSelect;
+	Event<>         WhenDrop;
+	Event<>         WhenSelect;
 
 	void            ClearList()                           { select.Clear(); }
 	void            AddList(const Value& data)            { select.Add(data); }
diff --git a/uppsrc/CtrlLib/EditCtrl.h b/uppsrc/CtrlLib/EditCtrl.h
index 231cf4b8a..367276fcc 100644
--- a/uppsrc/CtrlLib/EditCtrl.h
+++ b/uppsrc/CtrlLib/EditCtrl.h
@@ -168,10 +168,10 @@ protected:
 	virtual void  HighlightText(Vector<Highlight>& hl);
 
 public:
-	Callback1<Bar&>               WhenBar;
-	Callback                      WhenEnter;
-	Callback1<WString&>           WhenPasteFilter;
-	Callback1<Vector<Highlight>&> WhenHighlight;
+	Event<Bar&>               WhenBar;
+	Event<>                       WhenEnter;
+	Event<WString&>           WhenPasteFilter;
+	Event<Vector<Highlight>&> WhenHighlight;
 
 	static const Style& StyleDefault();
 	EditField&  SetStyle(const Style& s);
diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index 10b0ac6a7..c572b0669 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -465,7 +465,7 @@ bool MatchSearch(const String& filename, const String& search)
 }
 
 bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
-          Callback3<bool, const String&, Image&> WhenIcon, FileSystemInfo& filesystem,
+          Event<bool, const String&, Image&> WhenIcon, FileSystemInfo& filesystem,
           const String& search, bool hidden, bool hiddenfiles, bool lazyicons)
 {
 	if(dir.IsEmpty()) {
@@ -648,7 +648,7 @@ void LazyExeFileIcons::ReOrder()
 	Restart(0);
 }
 
-void LazyExeFileIcons::Start(FileList& list_, const String& dir_, Callback3<bool, const String&, Image&> WhenIcon_)
+void LazyExeFileIcons::Start(FileList& list_, const String& dir_, Event<bool, const String&, Image&> WhenIcon_)
 {
 	list = &list_;
 	dir = dir_;
diff --git a/uppsrc/CtrlLib/FileSel.h b/uppsrc/CtrlLib/FileSel.h
index d6c9f3036..fd12f42cf 100644
--- a/uppsrc/CtrlLib/FileSel.h
+++ b/uppsrc/CtrlLib/FileSel.h
@@ -72,7 +72,7 @@ protected:
 	};
 
 public:
-	Callback2<const String&, const String&> WhenRename;
+	Event<const String&, const String&> WhenRename;
 
 	void        StartEdit();
 	void        EndEdit();
@@ -121,7 +121,7 @@ public:
 };
 
 bool Load(FileList& list, const String& dir, const char *patterns, bool dirs = false,
-          Callback3<bool, const String&, Image&> WhenIcon = CNULL,
+          Event<bool, const String&, Image&> WhenIcon = Null,
           FileSystemInfo& filesystem = StdFileSystemInfo(), const String& search = String(),
           bool hidden = true, bool hiddenfiles = true, bool lazyicons = false);
 void SortByName(FileList& list);
@@ -135,7 +135,7 @@ class LazyExeFileIcons {
 	FileList    *list;
 	int          pos;
 	Vector<int>  ndx;
-	Callback3<bool, const String&, Image&> WhenIcon;
+	Event<bool, const String&, Image&> WhenIcon;
 
 	Mutex  mutex;
 
@@ -146,7 +146,7 @@ class LazyExeFileIcons {
 
 public:
 	void ReOrder();
-	void Start(FileList& list_, const String& dir_, Callback3<bool, const String&, Image&> WhenIcon_);
+	void Start(FileList& list_, const String& dir_, Event<bool, const String&, Image&> WhenIcon_);
 };
 #endif
 
@@ -258,7 +258,7 @@ protected:
 	typedef FileSel CLASSNAME;
 
 public:
-	Callback3<bool, const String&, Image&> WhenIcon;
+	Event<bool, const String&, Image&> WhenIcon;
 #ifdef _MULTITHREADED
 	void (*WhenIconLazy)(const String& path, Image& result);
 #endif
diff --git a/uppsrc/CtrlLib/HeaderCtrl.h b/uppsrc/CtrlLib/HeaderCtrl.h
index cbdf75dce..d97065c80 100644
--- a/uppsrc/CtrlLib/HeaderCtrl.h
+++ b/uppsrc/CtrlLib/HeaderCtrl.h
@@ -44,10 +44,10 @@ public:
 		friend class HeaderCtrl;
 
 	public:
-		Callback        WhenLeftClick;
-		Callback        WhenLeftDouble;
-		Callback        WhenAction;
-		Callback1<Bar&> WhenBar;
+		Event<>         WhenLeftClick;
+		Event<>         WhenLeftDouble;
+		Event<>         WhenAction;
+		Event<Bar&> WhenBar;
 
 		Column&  Min(int _min)                     { min = _min; return *this; }
 		Column&  Max(int _max)                     { max = _max; return *this; }
@@ -116,9 +116,9 @@ protected:
 	Vector<int> GetVisibleCi(int from);
 
 public:
-	Callback      WhenLayout;
-	Callback      WhenScroll;
-	Callback      WhenScrollVisibility;
+	Event<>       WhenLayout;
+	Event<>       WhenScroll;
+	Event<>       WhenScrollVisibility;
 
 	Rect          GetTabRect(int i);
 
diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp
index 796599d0d..fd5540b8b 100644
--- a/uppsrc/CtrlLib/MenuBar.cpp
+++ b/uppsrc/CtrlLib/MenuBar.cpp
@@ -111,7 +111,7 @@ void MenuBar::Clear()
 	lock--;
 }
 
-Bar::Item& MenuBar::AddItem(Callback cb)
+Bar::Item& MenuBar::AddItem(Event<>  cb)
 {
 	LLOG("MenuBar::AddItem " << Name());
 	MenuItemBase *q;
@@ -131,7 +131,7 @@ Bar::Item& MenuBar::AddItem(Callback cb)
 	return *q;
 }
 
-Bar::Item& MenuBar::AddSubMenu(Callback1<Bar&> proc)
+Bar::Item& MenuBar::AddSubMenu(Event<Bar&> proc)
 {
 	LLOG("MenuBar::AddSubMenu " << Name());
 	SubMenuBase *w;
@@ -248,7 +248,7 @@ void MenuBar::SyncState()
 void MenuBar::ChildGotFocus()
 {
 	if(submenu && !submenuitem->HasFocusDeep() && !ExistsTimeCallback()) {
-	   	if(submenu->IsOpen())
+		if(submenu->IsOpen())
 			submenu->DelayedClose();
 	}
 	KillDelayedClose();
@@ -469,7 +469,7 @@ void MenuBar::KillDelayedClose()
 	KillTimeCallback(TIMEID_STOP);
 }
 
-void MenuBar::Set(const Callback1<Bar&> menu)
+void MenuBar::Set(const Event<Bar&> menu)
 {
 	if(lock) return;
 	Clear();
@@ -480,7 +480,7 @@ void MenuBar::Set(const Callback1<Bar&> menu)
 	lock--;
 }
 
-void MenuBar::Post(Callback1<Bar&> bar)
+void MenuBar::Post(Event<Bar&> bar)
 {
 	KillTimeCallback(TIMEID_POST);
 	SetTimeCallback(0, THISBACK1(Set, bar), TIMEID_POST);
@@ -580,7 +580,7 @@ void MenuBar::Execute(Ctrl *owner, Point p)
 	ows.SetCount(level);
 }
 
-void MenuBar::Execute(Ctrl *owner, Callback1<Bar&> proc, Point p)
+void MenuBar::Execute(Ctrl *owner, Event<Bar&> proc, Point p)
 {
 	MenuBar bar;
 	proc(bar);
diff --git a/uppsrc/CtrlLib/MenuImp.h b/uppsrc/CtrlLib/MenuImp.h
index c4b2d6b55..447e139ac 100644
--- a/uppsrc/CtrlLib/MenuImp.h
+++ b/uppsrc/CtrlLib/MenuImp.h
@@ -100,7 +100,7 @@ public:
 class SubMenuBase {
 protected:
 	MenuBar  menu;
-	Callback1<Bar&> proc;
+	Event<Bar&> proc;
 	MenuBar *parentmenu;
 
 	void     Pull(Ctrl *item, Point p, Size sz);
@@ -109,8 +109,8 @@ public:
 	virtual  void Pull() = 0;
 
 	void SetParent(MenuBar *m)                           { parentmenu = m; menu.MaxIconSize(m->GetMaxIconSize()); }
-	void Set(Callback1<Bar&> _submenu)                   { proc = _submenu; }
-	Callback1<Bar&> Get()                                { return proc; }
+	void Set(Event<Bar&> _submenu)                   { proc = _submenu; }
+	Event<Bar&> Get()                                { return proc; }
 
 	SubMenuBase()                                        { parentmenu = NULL; }
 	virtual ~SubMenuBase() {}
diff --git a/uppsrc/CtrlLib/MultiButton.h b/uppsrc/CtrlLib/MultiButton.h
index 592e931ff..96618f182 100644
--- a/uppsrc/CtrlLib/MultiButton.h
+++ b/uppsrc/CtrlLib/MultiButton.h
@@ -61,8 +61,8 @@ public:
 		void Refresh();
 
 	public:
-		Callback WhenPush;
-		Callback WhenClick;
+		Event<>  WhenPush;
+		Event<>  WhenClick;
 
 		SubButton& SetImage(const Image& m);
 		SubButton& SetMonoImage(const Image& m);
@@ -75,7 +75,7 @@ public:
 		SubButton& Tip(const char *s)                     { tip = s; return *this; }
 		SubButton& Main(bool b = true);
 
-		Callback operator<<=(Callback cb)                 { WhenPush = cb; return cb; }
+		Event<>  operator<<=(Event<>  cb)                 { WhenPush = cb; return cb; }
 
 		SubButton();
 	};
@@ -124,8 +124,8 @@ private:
 	friend class MultiButtonFrame;
 
 public:
-	Callback WhenPush;
-	Callback WhenClick;
+	Event<>  WhenPush;
+	Event<>  WhenClick;
 
 	static const Style& StyleDefault();
 	static const Style& StyleFrame();
diff --git a/uppsrc/CtrlLib/Prompt.cpp b/uppsrc/CtrlLib/Prompt.cpp
index d61df6adc..ba8c025cb 100644
--- a/uppsrc/CtrlLib/Prompt.cpp
+++ b/uppsrc/CtrlLib/Prompt.cpp
@@ -50,7 +50,7 @@ void RedirectPrompts(RedirectPromptFn r)
 	RedirectPrompt = r;
 }
 
-int Prompt(Callback1<const String&> WhenLink,
+int Prompt(Event<const String&> WhenLink,
            const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
            const char *button1, const char *button2, const char *button3,
 		   int cx,
@@ -140,7 +140,7 @@ int Prompt(Callback1<const String&> WhenLink,
 	return result;
 }
 
-int Prompt(Callback1<const String&> WhenLink,
+int Prompt(Event<const String&> WhenLink,
            const char *title, const Image& icon, const char *qtf, bool okcancel,
            const char *button1, const char *button2, const char *button3,
 		   int cx)
diff --git a/uppsrc/CtrlLib/PushCtrl.h b/uppsrc/CtrlLib/PushCtrl.h
index 56c1dcf9b..15289e111 100644
--- a/uppsrc/CtrlLib/PushCtrl.h
+++ b/uppsrc/CtrlLib/PushCtrl.h
@@ -51,8 +51,8 @@ public:
 
 	int      GetVisualState() const;
 
-	Callback WhenPush;
-	Callback WhenRepeat;
+	Event<>  WhenPush;
+	Event<>  WhenRepeat;
 
 	Pusher();
 	virtual ~Pusher();
@@ -359,7 +359,7 @@ protected:
 	virtual void   DoAction();
 
 public:
-	Callback       WhenPreAction;
+	Event<>        WhenPreAction;
 
 
 	DataPusher&    SetConvert(const Convert& _convert) { convert = &_convert; Refresh(); return *this; }
diff --git a/uppsrc/CtrlLib/RichText.h b/uppsrc/CtrlLib/RichText.h
index 46603e9b4..8719efa3b 100644
--- a/uppsrc/CtrlLib/RichText.h
+++ b/uppsrc/CtrlLib/RichText.h
@@ -50,8 +50,8 @@ protected:
 	};
 
 public:
-	Callback1<const String&> WhenLink;
-	Callback1<int>           WhenMouseMove;
+	Event<const String&> WhenLink;
+	Event<int>           WhenMouseMove;
 
 	void            Clear();
 	void            Pick(RichText&& t);
@@ -125,13 +125,13 @@ public:
 };
 
 
-int Prompt(Callback1<const String&> WhenLink,
+int Prompt(Event<const String&> WhenLink,
            const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
            const char *button1, const char *button2, const char *button3,
 		   int cx,
 		   Image im1, Image im2, Image im3);
 
-int Prompt(Callback1<const String&> WhenLink,
+int Prompt(Event<const String&> WhenLink,
            const char *title, const Image& icon, const char *qtf, bool okcancel,
            const char *button1, const char *button2 = NULL, const char *button3 = NULL,
 		   int cx = 0);
@@ -173,7 +173,7 @@ void RetryButtonImage_Write(Image m);
 
 
 typedef
-int (*RedirectPromptFn)(Callback1<const String&> WhenLink,
+int (*RedirectPromptFn)(Event<const String&> WhenLink,
                         const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
                         const char *button1, const char *button2, const char *button3,
                         int cx, Image im1, Image im2, Image im3);
diff --git a/uppsrc/CtrlLib/ScrollBar.h b/uppsrc/CtrlLib/ScrollBar.h
index 15aa7baaf..dec403f12 100644
--- a/uppsrc/CtrlLib/ScrollBar.h
+++ b/uppsrc/CtrlLib/ScrollBar.h
@@ -65,9 +65,9 @@ private:
 	int     ScrollBarSize() const                 { return style->barsize; }
 
 public:
-	Callback WhenScroll;
-	Callback WhenVisibility;
-	Callback WhenLeftClick;
+	Event<>  WhenScroll;
+	Event<>  WhenVisibility;
+	Event<>  WhenLeftClick;
 
 	bool    IsHorz() const                  { return horz; }
 	bool    IsVert() const                  { return !horz; }
@@ -178,8 +178,8 @@ public:
 	HScrollBar x;
 	VScrollBar y;
 
-	Callback   WhenScroll;
-	Callback   WhenLeftClick;
+	Event<>    WhenScroll;
+	Event<>    WhenLeftClick;
 
 	void    Set(Point pos, Size page, Size total);
 	bool    Set(Point pos);
diff --git a/uppsrc/CtrlLib/SliderCtrl.h b/uppsrc/CtrlLib/SliderCtrl.h
index 165902a9e..166b5ad98 100644
--- a/uppsrc/CtrlLib/SliderCtrl.h
+++ b/uppsrc/CtrlLib/SliderCtrl.h
@@ -16,7 +16,7 @@ class SliderCtrl : public Ctrl {
 public:
 	typedef SliderCtrl CLASSNAME;
 
-	Callback      WhenSlideFinish;
+	Event<>       WhenSlideFinish;
 	
 	SliderCtrl();
 	virtual ~SliderCtrl();
diff --git a/uppsrc/CtrlLib/Splitter.h b/uppsrc/CtrlLib/Splitter.h
index 8270dd9a3..856d17c2f 100644
--- a/uppsrc/CtrlLib/Splitter.h
+++ b/uppsrc/CtrlLib/Splitter.h
@@ -34,7 +34,7 @@ protected: // Because of docking... (will be private)
 	friend class SplitterFrame;
 
 public:
-	Callback  WhenSplitFinish;
+	Event<>   WhenSplitFinish;
 
 	void      Set(Ctrl& l, Ctrl& r);
 
diff --git a/uppsrc/CtrlLib/StatusBar.h b/uppsrc/CtrlLib/StatusBar.h
index 5c8b0c862..6e745a135 100644
--- a/uppsrc/CtrlLib/StatusBar.h
+++ b/uppsrc/CtrlLib/StatusBar.h
@@ -72,9 +72,9 @@ private:
 public:
 	void operator=(const String& s)           { Set(s); }
 
-	operator Callback1<const String&>()       { return pteback(this, &StatusBar::SetText); }
+	operator Event<const String&>()       { return pteback(this, &StatusBar::SetText); }
 
-	Callback1<const String&> operator~()      { return pteback(this, &StatusBar::SetText); }
+	Event<const String&> operator~()      { return pteback(this, &StatusBar::SetText); }
 
 	StatusBar&  Height(int _cy);
 	StatusBar&  NoSizeGrip()                  { RemoveFrame(grip); return *this; }
diff --git a/uppsrc/CtrlLib/TabCtrl.h b/uppsrc/CtrlLib/TabCtrl.h
index 429506b28..1ba4c7f7b 100644
--- a/uppsrc/CtrlLib/TabCtrl.h
+++ b/uppsrc/CtrlLib/TabCtrl.h
@@ -96,7 +96,7 @@ private:
 	int        FindInsert(Ctrl& slave);
 
 public:
-	Callback WhenSet;
+	Event<>  WhenSet;
 
 	TabCtrl::Item& Add();
 	TabCtrl::Item& Add(const char *text);
diff --git a/uppsrc/CtrlLib/TextEdit.h b/uppsrc/CtrlLib/TextEdit.h
index 1a9ac76ab..e19189545 100644
--- a/uppsrc/CtrlLib/TextEdit.h
+++ b/uppsrc/CtrlLib/TextEdit.h
@@ -105,9 +105,9 @@ protected:
 public:
 	virtual void   RefreshLine(int i);
 
-	Callback1<Bar&> WhenBar;
-	Callback        WhenState;
-	Callback        WhenSel;
+	Event<Bar&> WhenBar;
+	Event<>         WhenState;
+	Event<>         WhenSel;
 
 	void   CachePos(int pos);
 	void   CacheLinePos(int linei);
diff --git a/uppsrc/CtrlLib/ToolBar.cpp b/uppsrc/CtrlLib/ToolBar.cpp
index 240eef6f0..6d7f10a93 100644
--- a/uppsrc/CtrlLib/ToolBar.cpp
+++ b/uppsrc/CtrlLib/ToolBar.cpp
@@ -52,7 +52,7 @@ void ToolBar::Paint(Draw& w)
 	PaintBar(w, style->breaksep, look);
 }
 
-Bar::Item& ToolBar::AddItem(Callback cb)
+Bar::Item& ToolBar::AddItem(Event<>  cb)
 {
 	ToolButton& m = item.DoIndex(ii++);
 	m.ResetKeepStyle();
@@ -66,7 +66,7 @@ Bar::Item& ToolBar::AddItem(Callback cb)
 	return m;
 }
 
-Bar::Item& ToolBar::AddSubMenu(Callback1<Bar&> proc)
+Bar::Item& ToolBar::AddSubMenu(Event<Bar&> proc)
 {
 	if(item.GetCount())
 		Separator();
@@ -85,7 +85,7 @@ bool ToolBar::HotKey(dword key)
 	return Bar::Scan(proc, key) || Ctrl::HotKey(key);
 }
 
-void ToolBar::Set(Callback1<Bar&> bar)
+void ToolBar::Set(Event<Bar&> bar)
 {
 	LTIMING("SetToolBar");
 	if(lock) return;
@@ -102,7 +102,7 @@ void ToolBar::Set(Callback1<Bar&> bar)
 	lock--;
 }
 
-void ToolBar::Post(Callback1<Bar&> bar)
+void ToolBar::Post(Event<Bar&> bar)
 {
 	KillTimeCallback(TIMEID_POST);
 	SetTimeCallback(0, PTEBACK1(Set, bar), TIMEID_POST);
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
index dd56e441f..85f04a570 100644
--- a/uppsrc/CtrlLib/TreeCtrl.h
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -168,21 +168,21 @@ protected:
 	friend class PopUpTree;
 
 public:
-	Callback1<int>  WhenOpen;
-	Callback1<int>  WhenClose;
-	Callback        WhenLeftClick;
-	Callback        WhenLeftDouble;
-	Callback1<Bar&> WhenBar;
-	Callback        WhenSel;
+	Event<int>  WhenOpen;
+	Event<int>  WhenClose;
+	Event<>     WhenLeftClick;
+	Event<>     WhenLeftDouble;
+	Event<Bar&> WhenBar;
+	Event<>     WhenSel;
 
-	Callback                        WhenDrag;
-	Callback2<int, PasteClip&>      WhenDropItem;
-	Callback3<int, int, PasteClip&> WhenDropInsert;
-	Callback1<PasteClip&>           WhenDrop;
+	Event<>                     WhenDrag;
+	Event<int, PasteClip&>      WhenDropItem;
+	Event<int, int, PasteClip&> WhenDropInsert;
+	Event<PasteClip&>           WhenDrop;
 
 	// deprecated - use WhenSel
-	Callback        WhenCursor;
-	Callback        WhenSelection;
+	Event<>         WhenCursor;
+	Event<>         WhenSelection;
 
 	void   SetRoot(const Node& n);
 	void   SetRoot(const Image& img, Value v);
@@ -341,7 +341,7 @@ protected:
 	virtual void SetChildren(int id, bool b);
 
 public:
-	Callback WhenOption;
+	Event<>  WhenOption;
 
 	void SetRoot(const Image& img, Option& option, const char *text = NULL);
 	void SetRoot(Option& option, const char *text = NULL);
@@ -398,8 +398,8 @@ public:
 	void         PopUp(Ctrl *owner, int width);
 	void         PopUp(Ctrl *owner);
 
-	Callback     WhenCancel;
-	Callback     WhenSelect;
+	Event<>      WhenCancel;
+	Event<>      WhenSelect;
 
 	PopUpTree&   MaxHeight(int maxheight_)          { maxheight = maxheight_; return *this; }
 	int          GetMaxHeight() const               { return maxheight; }
@@ -430,7 +430,7 @@ private:
 	typedef DropTree CLASSNAME;
 
 public:
-	Callback      WhenDrop;
+	Event<>       WhenDrop;
 
 	void Clear();
 
diff --git a/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp
index 46d3f1721..919f1f4c7 100644
--- a/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp
+++ b/uppsrc/CtrlLib/src.tpp/ArrayCtrl$en-us.tpp
@@ -2754,33 +2754,17 @@ editing.&]
 [s7; [*/ Return value]-|[* `*this]&]
 [s3; &]
 [s4; &]
-[s5;:ArrayCtrl`:`:Column`:`:Ctrls`(Callback1`<One`<Ctrl`>`&`>`): [_^ArrayCtrl`:`:Column^ C
-olumn][@(0.0.255) `&]_[* Ctrls]([_^Callback1^ Callback1]<[_^One^ One]<[_^Ctrl^ Ctrl]>`&>_[*@3 f
-actory])&]
-[s2; The methods sets up a factory which the ArrayCtrl uses as necessary 
-to create new Ctrl`'s for editing a given column. The argument 
-of this function is a callback, which, upon execution, should 
-allocate (normally using the [* new] operator) the desired editor 
-object and set it to its argument. If the position of Ctrl is 
-equivalent to `'SetRect(0, 0, 0, 0)`', which is the default value, 
-Ctrl is resized to fit the ArrayCtrl cell accurately, spanning 
-the whole width and using STDSIZE for height, otherwise the position 
-represents the position within the cell.&]
-[s7; [*C@3 factory]-|callback used for new control creation&]
-[s7; [*/ Return value]-|[* `*this]&]
-[s3; &]
-[s4; &]
 [s5;:ArrayCtrl`:`:Column`:`:Ctrls`(void`(`*`)`(One`<Ctrl`>`&`)`): [_^ArrayCtrl`:`:Column^ C
 olumn][@(0.0.255) `&]_[* Ctrls]([@(0.0.255) void]_(`*[*@3 factory])(One<Ctrl>`&))&]
-[s2; This method sets up a factory which the ArrayCtrl uses as necessary 
-to create new Ctrl`'s for editing a given column. The argument, 
-a global function, is supposed to allocate a new editor control 
-(normally using the [* new] operator) and set it to its argument. 
-If the position of Ctrl is equivalent to `'SetRect(0, 0, 0, 0)`', 
-which is the default value, Ctrl is resized to fit the ArrayCtrl 
-cell accurately, spanning the whole width and using STDSIZE for 
-height, otherwise the position represents the position within 
-the cell.&]
+[s2; The methods sets up a factory which the ArrayCtrl uses as necessary 
+to create new Ctrl`'s for editing a given column. The argument 
+of this function is a function pointer, which, upon execution, 
+should allocate (normally using the One`::Create method) the desired 
+editor object and set it to its argument. If the position of 
+Ctrl is equivalent to `'SetRect(0, 0, 0, 0)`', which is the default 
+value, Ctrl is resized to fit the ArrayCtrl cell accurately, 
+spanning the whole width and using STDSIZE for height, otherwise 
+the position represents the position within the cell.&]
 [s7; [*C@3 factory]-|a global function used for editor control creation&]
 [s7; [*/ Return value]-|[* `*this]&]
 [s3; &]
@@ -2798,6 +2782,20 @@ the position represents the position within the cell.&]
 [s7; [*C@4 T]-|the desired object editor type &]
 [s7; [*/ Return value]-|[* `*this]&]
 [s3; &]
+[s4;%- &]
+[s5;:Upp`:`:ArrayCtrl`:`:Column`:`:Ctrls`(Upp`:`:Event`<int`,Upp`:`:One`<Upp`:`:Ctrl`>`&`>`):%- [_^Upp`:`:ArrayCtrl`:`:Column^ C
+olumn][@(0.0.255) `&]_[* Ctrls]([_^Upp`:`:Event^ Event]<[@(0.0.255) int], 
+[_^Upp`:`:One^ One]<[_^Upp`:`:Ctrl^ Ctrl]>`&>_[*@3 factory])&]
+[s2; This method sets up a factory which the ArrayCtrl uses to create 
+new Ctrl`'s for editing a given column. The argument, a global 
+function, is supposed to allocate a new editor control (normally 
+using the One`::Create method) and set it to its argument. The 
+first argument of Event is the line index. If the position of 
+Ctrl is equivalent to `'SetRect(0, 0, 0, 0)`', which is the default 
+value, Ctrl is resized to fit the ArrayCtrl cell accurately, 
+spanning the whole width and using STDSIZE for height, otherwise 
+the position represents the position within the cell..&]
+[s3; &]
 [s4; &]
 [s5;:ArrayCtrl`:`:Column`:`:InsertValue`(const Value`&`): [_^ArrayCtrl`:`:Column^ Colum
 n][@(0.0.255) `&]_[* InsertValue]([@(0.0.255) const]_[_^Value^ Value][@(0.0.255) `&]_[*@3 v])
diff --git a/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp b/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp
index 88e4625fc..ed188e076 100644
--- a/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp
+++ b/uppsrc/CtrlLib/srcdoc.tpp/Tutorial$en-us.tpp
@@ -235,9 +235,9 @@ Arial(20));&]
 [s5; &]
 [s3;:Gui07: 7. Menu&]
 [s5; Content of menu in U`+`+ is represented by the function or method 
-adding required menu items to the [* Bar]. Items can contain [^topic`:`/`/Core`/src`/Callbacks`$en`-us^ C
-allbacks] to actions invoked by choosing the menu item or [^topic`:`/`/Core`/src`/Callbacks`$en`-us^ C
-allbacks] to sub`-menus. Menu itself is managed by [* MenuBar]. 
+adding required menu items to the [* Bar]. Items can contain [^topic`:`/`/Core`/src`/Callbacks`$en`-us^ E
+vents] to actions invoked by choosing the menu item or [^topic`:`/`/Core`/src`/Function`$en`-us`#Upp`:`:Event`:`:typedef^ E
+vents] to represent sub`-menus. Menu itself is managed by [* MenuBar]. 
 [* MenuBar] can act both as widget or as a [*/^topic`:`/`/CtrlCore`/srcdoc`/AboutFrames`$en`-us^ F
 rame]. Frames are placed to the window border and reduce its 
 view area.&]
@@ -247,27 +247,27 @@ view area.&]
 [s7; using namespace Upp;&]
 [s7; &]
 [s7; struct MyAppWindow : TopWindow `{&]
-[s7; [* -|MenuBar menu;]&]
+[s7; -|MenuBar menu;&]
 [s7; &]
-[s7; -|void Exit() `{&]
+[s7; -|void [* Exit]() `{&]
 [s7; -|-|if(PromptOKCancel(`"Exit MyApp?`"))&]
 [s7; -|-|-|Break();&]
 [s7; -|`}&]
-[s7; -|&]
-[s7; [* -|void SubMenu(Bar`& bar) `{]&]
-[s7; [* -|-|bar.Add(`"Exit`", THISBACK(Exit));]&]
-[s7; [* -|`}]&]
-[s7; [* -|]&]
-[s7; [* -|void MainMenu(Bar`& bar) `{]&]
-[s7; [* -|-|bar.Add(`"Menu`", THISBACK(SubMenu));]&]
-[s7; [* -|`}]&]
-[s7;* &]
-[s7; [* -|typedef MyAppWindow CLASSNAME;]&]
+[s7; &]
+[s7; -|void [* SubMenu](Bar`& bar) `{&]
+[s7; -|-|bar.[* Add](`"Exit`", `[`=`] `{ [* Exit](); `});&]
+[s7; -|`}&]
+[s7; &]
+[s7; -|void [* MainMenu](Bar`& bar) `{&]
+[s7; -|-|bar.[* Sub](`"Menu`", `[`=`](Bar`& bar) `{ [* SubMenu](bar); `});&]
+[s7; -|`}&]
+[s7; &]
+[s7; -|typedef MyAppWindow CLASSNAME;&]
 [s7; &]
 [s7; -|MyAppWindow() `{&]
 [s7; -|-|Title(`"My application with menu`").Sizeable();&]
-[s7; [* -|-|AddFrame(menu);]&]
-[s7; [* -|-|menu.Set(THISBACK(MainMenu));]&]
+[s7; -|-|[* AddFrame](menu);&]
+[s7; -|-|menu.[* Set](`[`=`](Bar`& bar) `{ [* MainMenu](bar); `});&]
 [s7; -|`}&]
 [s7; `};&]
 [s7; &]
@@ -276,6 +276,7 @@ view area.&]
 [s7; -|MyAppWindow app;&]
 [s7; -|app.Run();&]
 [s7; `}&]
+[s7; &]
 [s5; &]
 [s0;= 
 @@image:1240&949
@@ -284,6 +285,37 @@ view area.&]
 @@image:1240&964
 (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)
 &]
+[s5; Of course, with power of C`+`+11 lambdas, it is also possible, 
+if not always advisable, to `'inline`' the whole menu structure 
+to single MenuBar`::Set call:&]
+[s7; &]
+[s7; #include <CtrlLib/CtrlLib.h>&]
+[s7; &]
+[s7; using namespace Upp;&]
+[s7; &]
+[s7; struct MyAppWindow : TopWindow `{&]
+[s7; -|MenuBar menu;&]
+[s7; &]
+[s7; -|MyAppWindow() `{&]
+[s7; -|-|Title(`"My application with menu`").Sizeable();&]
+[s7; -|-|AddFrame(menu);&]
+[s7; -|-|menu.[* Set](`[`=`](Bar`& bar) `{&]
+[s7; -|-|-|bar.Sub(`"Menu`", `[`=`](Bar`& bar) `{&]
+[s7; -|-|-|-|bar.Add(`"Exit`", `[`=`] `{&]
+[s7; -|-|-|-|-|if(PromptOKCancel(`"Exit MyApp?`"))&]
+[s7; -|-|-|-|-|-|Break();&]
+[s7; -|-|-|-|`});&]
+[s7; -|-|-|`});&]
+[s7; -|-|`});&]
+[s7; -|`}&]
+[s7; `};&]
+[s7; &]
+[s7; GUI`_APP`_MAIN&]
+[s7; `{&]
+[s7; -|MyAppWindow app;&]
+[s7; -|app.Run();&]
+[s7; `}&]
+[s7; &]
 [s5; &]
 [s3;:Gui08: 8. Context menu&]
 [s5; Context local menu (usually invoked by right mouse click) is 
@@ -296,22 +328,19 @@ menu:&]
 [s7; using namespace Upp;&]
 [s7; &]
 [s7; struct MyAppWindow : TopWindow `{&]
-[s7; &]
 [s7; -|void Exit() `{&]
 [s7; -|-|if(PromptOKCancel(`"Exit MyApp?`"))&]
 [s7; -|-|-|Break();&]
 [s7; -|`}&]
-[s7; -|&]
-[s7; -|void LocalMenu(Bar`& bar) `{&]
-[s7; -|-|bar.Add(`"Exit`", THISBACK(Exit));&]
-[s7; -|`}&]
 [s7; &]
 [s7; -|void RightDown(Point, dword) `{&]
-[s7; [* -|-|MenuBar`::Execute(THISBACK(LocalMenu));]&]
+[s7; -|-|MenuBar`::Execute(&]
+[s7; -|-|-|`[`=`](Bar`& bar) `{&]
+[s7; -|-|-|-|bar.Add(`"Exit`", `[`=`] `{ Exit(); `});&]
+[s7; -|-|-|`}&]
+[s7; -|-|);&]
 [s7; -|`}&]
 [s7; &]
-[s7; -|typedef MyAppWindow CLASSNAME;&]
-[s7; &]
 [s7; -|MyAppWindow() `{&]
 [s7; -|-|Title(`"My application with local menu`").Sizeable();&]
 [s7; -|`}&]
@@ -323,20 +352,16 @@ menu:&]
 [s7; -|app.Run();&]
 [s7; `}&]
 [s7; &]
+[s7; &]
 [s0;= 
 @@image:1349&640
 (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)
 &]
 [s5;= &]
-[s3;:Gui09: 9. Context menu alternative and using CallbackArgTarget&]
+[s3;:Gui09: 9. Context menu alternative&]
 [s5; It is also possible to create context menu by adding menu items 
-directly to MenuBar. Also, quite often the result of context 
-menu is some value `- in such case, [* CallbackArgTarget] can be 
-used to simplify the task `- CallbackArgTarget [* operator`[`]] 
-returns callback which, when invoked, stores the value of index 
-(which has to be of CalbackArgTarget`'s template parameter type) 
-for later retrieval. If none of operator`[`] callbacks is invoked, 
-the value of CallbackArgTarget remains Null:&]
+directly to MenuBar. Example also demonstrates how to convert 
+the menu item to same value, by using lambda capture by reference:&]
 [s5; &]
 [s7; #include <CtrlLib/CtrlLib.h>&]
 [s7; &]
@@ -347,20 +372,19 @@ the value of CallbackArgTarget remains Null:&]
 [s7; -|-|if(PromptOKCancel(`"Exit MyApp?`"))&]
 [s7; -|-|-|Break();&]
 [s7; -|`}&]
-[s7; -|&]
-[s7; -|void RightDown(Point, dword) `{&]
-[s7; [* -|-|CallbackArgTarget<int> result;]&]
-[s7; [* -|-|MenuBar menu;]&]
-[s7; [* -|-|for(int i `= 0; i < 10; i`+`+)]&]
-[s7; [* -|-|-|menu.Add(AsString(i), result`[i`]);]&]
-[s7; [* -|-|menu.Separator();]&]
-[s7; [* -|-|menu.Add(`"Exit`", THISBACK(Exit));]&]
-[s7; [* -|-|menu.Execute();]&]
-[s7; [* -|-|if(!IsNull(result))]&]
-[s7; [* -|-|-|PromptOK(`"You have selected `" `+ AsString((int)result));]&]
-[s7; -|`}&]
 [s7; &]
-[s7; -|typedef MyAppWindow CLASSNAME;&]
+[s7; -|void RightDown(Point, dword) `{&]
+[s7; -|-|int [* result ]`= Null;&]
+[s7; -|-|[* MenuBar menu];&]
+[s7; -|-|for(int i `= 0; i < 10; i`+`+)&]
+[s7; -|-|-|menu.Add(AsString(i), `[`=, [* `&result]`] `{ [* result ]`= i; 
+`});&]
+[s7; -|-|menu.Separator();&]
+[s7; -|-|menu.Add(`"Exit`", `[`=`] `{ Exit(); `});&]
+[s7; -|-|menu.[* Execute]();&]
+[s7; -|-|if(!IsNull([* result]))&]
+[s7; -|-|-|PromptOK(`"You have selected `" `+ AsString((int)result));&]
+[s7; -|`}&]
 [s7; &]
 [s7; -|MyAppWindow() `{&]
 [s7; -|-|Title(`"My application with context menu`").Sizeable();&]
@@ -373,6 +397,7 @@ the value of CallbackArgTarget remains Null:&]
 [s7; -|app.Run();&]
 [s7; `}&]
 [s7; &]
+[s7; &]
 [s5; &]
 [s0;= 
 @@image:1329&1704
@@ -401,7 +426,7 @@ commands:&]
 [s7; using namespace Upp;&]
 [s7; &]
 [s7; [* #define IMAGECLASS TutorialImg]&]
-[s7; [* #define IMAGEFILE <][*/ Tutorial][* /images.iml>]&]
+[s7; [* #define IMAGEFILE <Gui10/images.iml>]&]
 [s7; [* #include <Draw/iml.h>]&]
 [s7; &]
 [s7; struct MyAppWindow : TopWindow `{&]
@@ -413,19 +438,16 @@ commands:&]
 [s7; -|`}&]
 [s7; &]
 [s7; -|void SubMenu(Bar`& bar) `{&]
-[s7; -|-|bar.Add(`"Exit`", [* TutorialImg`::Exit()], THISBACK(Exit));&]
+[s7; -|-|bar.Add(`"Exit`", [* TutorialImg`::Exit()], `[`=`] `{ Exit(); 
+`});&]
 [s7; -|`}&]
-[s7; -|&]
-[s7; -|void MainMenu(Bar`& bar) `{&]
-[s7; -|-|bar.Add(`"Menu`", THISBACK(SubMenu));&]
-[s7; -|`}&]
-[s7; &]
-[s7; -|typedef MyAppWindow CLASSNAME;&]
 [s7; &]
 [s7; -|MyAppWindow() `{&]
 [s7; -|-|Title(`"My application with menu and images`").Sizeable();&]
 [s7; -|-|AddFrame(menu);&]
-[s7; -|-|menu.Set(THISBACK(MainMenu));&]
+[s7; -|-|menu.Set(`[`=`](Bar`& bar) `{&]
+[s7; -|-|-|bar.Sub(`"Menu`", `[`=`](Bar`& bar) `{ SubMenu(bar); `});&]
+[s7; -|-|`});&]
 [s7; -|`}&]
 [s7; `};&]
 [s7; &]
@@ -434,6 +456,7 @@ commands:&]
 [s7; -|MyAppWindow app;&]
 [s7; -|app.Run();&]
 [s7; `}&]
+[s7; &]
 [s5; &]
 [s5; Here [*/ Tutorial ]is the name of package where .iml file resides.&]
 [s5; Image constants are represented by class methods of class defined 
diff --git a/uppsrc/Esc/Esc.h b/uppsrc/Esc/Esc.h
index ac6c7c2ea..61d14d05f 100644
--- a/uppsrc/Esc/Esc.h
+++ b/uppsrc/Esc/Esc.h
@@ -92,8 +92,8 @@ public:
 	EscLambda&                           CreateLambda();
 
 
-	void    Escape(const char *method, Callback1<EscEscape&> escape);
-	void    Escape(const char *method, EscHandle *h, Callback1<EscEscape&> escape);
+	void    Escape(const char *method, Event<EscEscape&> escape);
+	void    Escape(const char *method, EscHandle *h, Event<EscEscape&> escape);
 	bool    HasNumberField(const char *id) const;
 	int     GetFieldInt(const char *id) const;
 
@@ -158,7 +158,7 @@ public:
 	Vector<bool>          inout;
 	String                code;
 	EscHandle            *handle;
-	Callback1<EscEscape&> escape;
+	Event<EscEscape&> escape;
 	bool                  varargs;
 	String                filename;
 	int                   line;
@@ -291,7 +291,7 @@ struct EscEscape {
 };
 
 void Escape(ArrayMap<String, EscValue>& globals, const char *function, void (*escape)(EscEscape& e));
-void Escape(ArrayMap<String, EscValue>& globals, const char *function, Callback1<EscEscape&> escape);
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, Event<EscEscape&> escape);
 
 void Scan(ArrayMap<String, EscValue>& global, const char *code, const char *filename = "");
 
diff --git a/uppsrc/Esc/EscRun.cpp b/uppsrc/Esc/EscRun.cpp
index 6ba95f163..75194d5e8 100644
--- a/uppsrc/Esc/EscRun.cpp
+++ b/uppsrc/Esc/EscRun.cpp
@@ -118,7 +118,7 @@ void  EscEscape::CheckMap(int i)
 	ThrowError(String().Cat() << "map expected as parameter " << i + 1 << InCall());
 }
 
-void Escape(ArrayMap<String, EscValue>& globals, const char *function, Callback1<EscEscape&> escape)
+void Escape(ArrayMap<String, EscValue>& globals, const char *function, Event<EscEscape&> escape)
 {
 	CParser p(function);
 	EscValue& v = globals.GetPut(p.ReadId());
@@ -132,7 +132,7 @@ void Escape(ArrayMap<String, EscValue>& globals, const char *function, void (*es
 	Escape(globals, function, callback(escape));
 }
 
-void  EscValue::Escape(const char *method, Callback1<EscEscape&> escape)
+void  EscValue::Escape(const char *method, Event<EscEscape&> escape)
 {
 	CParser p(method);
 	String id = p.ReadId();
@@ -143,7 +143,7 @@ void  EscValue::Escape(const char *method, Callback1<EscEscape&> escape)
 	MapSet(id, v);
 }
 
-void  EscValue::Escape(const char *method, EscHandle *h, Callback1<EscEscape&> escape)
+void  EscValue::Escape(const char *method, EscHandle *h, Event<EscEscape&> escape)
 {
 	CParser p(method);
 	String id = p.ReadId();
diff --git a/uppsrc/HexView/HexView.h b/uppsrc/HexView/HexView.h
index e4641cac0..c45f27a83 100644
--- a/uppsrc/HexView/HexView.h
+++ b/uppsrc/HexView/HexView.h
@@ -64,8 +64,8 @@ private:
 public:
 	virtual int Byte(int64 adr);
 
-	Callback1<Bar&>          WhenBar;
-	Callback1<const String&> WhenGoto;
+	Event<Bar&>          WhenBar;
+	Event<const String&> WhenGoto;
 
 	void  ColumnsMenu(Bar& bar);
 	void  CharsetMenu(Bar& bar);
diff --git a/uppsrc/Painter/Painter.h b/uppsrc/Painter/Painter.h
index c5b912da1..19834b91d 100644
--- a/uppsrc/Painter/Painter.h
+++ b/uppsrc/Painter/Painter.h
@@ -434,13 +434,13 @@ protected:
 	virtual void   BeginOnPathOp(double q, bool abs);
 };
 
-bool  RenderSVG(Painter& p, const char *svg, Callback2<String, String&> resloader);
+bool  RenderSVG(Painter& p, const char *svg, Event<String, String&> resloader);
 bool  RenderSVG(Painter& p, const char *svg);
 
 void  GetSVGDimensions(const char *svg, Sizef& sz, Rectf& viewbox);
 Rectf GetSVGBoundingBox(const char *svg);
 
-Image RenderSVGImage(Size sz, const char *svg, Callback2<String, String&> resloader);
+Image RenderSVGImage(Size sz, const char *svg, Event<String, String&> resloader);
 Image RenderSVGImage(Size sz, const char *svg);
 
 }
diff --git a/uppsrc/Painter/SvgInternal.h b/uppsrc/Painter/SvgInternal.h
index c223166a5..0cf3d8bce 100644
--- a/uppsrc/Painter/SvgInternal.h
+++ b/uppsrc/Painter/SvgInternal.h
@@ -123,7 +123,7 @@ struct SvgParser : XmlParser {
 	
 	bool Parse();
 
-	Callback2<String, String&> resloader;
+	Event<String, String&> resloader;
 	
 	SvgParser(const char *svg, Painter& sw);
 };
diff --git a/uppsrc/Painter/SvgParser.cpp b/uppsrc/Painter/SvgParser.cpp
index a5ba45b71..95c05dd2c 100644
--- a/uppsrc/Painter/SvgParser.cpp
+++ b/uppsrc/Painter/SvgParser.cpp
@@ -443,7 +443,7 @@ SvgParser::SvgParser(const char *svg, Painter& sw)
 	Reset();
 }
 
-bool ParseSVG(Painter& p, const char *svg, Callback2<String, String&> resloader, Rectf *boundingbox)
+bool ParseSVG(Painter& p, const char *svg, Event<String, String&> resloader, Rectf *boundingbox)
 {
 	SvgParser sp(svg, p);
 	sp.bp.compute_svg_boundingbox = boundingbox;
@@ -455,14 +455,14 @@ bool ParseSVG(Painter& p, const char *svg, Callback2<String, String&> resloader,
 	return true;
 }
 
-bool RenderSVG(Painter& p, const char *svg, Callback2<String, String&> resloader)
+bool RenderSVG(Painter& p, const char *svg, Event<String, String&> resloader)
 {
 	return ParseSVG(p, svg, resloader, NULL);
 }
 
 bool RenderSVG(Painter& p, const char *svg)
 {
-	return RenderSVG(p, svg, Callback2<String, String&>());
+	return RenderSVG(p, svg, Event<String, String&>());
 }
 
 void GetSVGDimensions(const char *svg, Sizef& sz, Rectf& viewbox)
@@ -485,12 +485,12 @@ Rectf GetSVGBoundingBox(const char *svg)
 {
 	NilPainter nil;
 	Rectf bb;
-	if(!ParseSVG(nil, svg, Callback2<String, String&>(), &bb))
+	if(!ParseSVG(nil, svg, Event<String, String&>(), &bb))
 		return Null;
 	return bb;
 }
 
-Image RenderSVGImage(Size sz, const char *svg, Callback2<String, String&> resloader)
+Image RenderSVGImage(Size sz, const char *svg, Event<String, String&> resloader)
 {
 	Rectf f = GetSVGBoundingBox(svg);
 	Sizef iszf = GetFitSize(f.GetSize(), Sizef(sz.cx, sz.cy) - 10.0);
@@ -508,7 +508,7 @@ Image RenderSVGImage(Size sz, const char *svg, Callback2<String, String&> resloa
 
 Image RenderSVGImage(Size sz, const char *svg)
 {
-	return RenderSVGImage(sz, svg, Callback2<String, String&>());
+	return RenderSVGImage(sz, svg, Event<String, String&>());
 }
 
 }
diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h
index 47a4a54f4..35cb9581e 100644
--- a/uppsrc/RichEdit/RichEdit.h
+++ b/uppsrc/RichEdit/RichEdit.h
@@ -49,12 +49,12 @@ private:
 	int           newtabalign;
 	
 public:
-	Callback      WhenLeftDouble;
-	Callback      WhenLeftDown;
-	Callback      WhenRightDown;
-	Callback      WhenBeginTrack;
-	Callback      WhenTrack;
-	Callback      WhenEndTrack;
+	Event<>       WhenLeftDouble;
+	Event<>       WhenLeftDown;
+	Event<>       WhenRightDown;
+	Event<>       WhenBeginTrack;
+	Event<>       WhenTrack;
+	Event<>       WhenEndTrack;
 
 	void          SetLayout(int x, int pgcx, Zoom zoom, double grid,
 	                        int numbers = INT_MAX, double numbermul = 1, int marks = INT_MAX,
@@ -636,7 +636,7 @@ private:
 	};
 
 	void UserAction();
-	Callback User(Callback cb);
+	Event<>  User(Event<>  cb);
 
 	static void   SpellerAdd(const WString& w, int lang);
 	static int    CompareStyle(const Value& a, const Value& b);
@@ -661,12 +661,12 @@ public:
 	static Bits   SpellParagraph(const RichPara& p);
 	static void   FixedLang(int lang)              { fixedlang = lang; }
 
-	Callback                     WhenRefreshBar;
-	Callback                     WhenStartEvaluating;
-	Callback2<String&, WString&> WhenHyperlink;
-	Callback1<String&>           WhenLabel;
-	Callback1<String&>           WhenIndexEntry;
-	Callback1<Bar&>              WhenBar;
+	Event<>                  WhenRefreshBar;
+	Event<>                  WhenStartEvaluating;
+	Event<String&, WString&> WhenHyperlink;
+	Event<String&>           WhenLabel;
+	Event<String&>           WhenIndexEntry;
+	Event<Bar&>              WhenBar;
 
 	void   StdBar(Bar& menu);
 
diff --git a/uppsrc/RichEdit/Tool.cpp b/uppsrc/RichEdit/Tool.cpp
index ba33f35df..458c3507e 100644
--- a/uppsrc/RichEdit/Tool.cpp
+++ b/uppsrc/RichEdit/Tool.cpp
@@ -7,7 +7,7 @@ void RichEdit::UserAction()
 	useraction = true;
 }
 
-Callback RichEdit::User(Callback cb)
+Event<>  RichEdit::User(Event<>  cb)
 {
 	cb << THISBACK(UserAction);
 	return cb;
diff --git a/uppsrc/TabBar/TabBar.h b/uppsrc/TabBar/TabBar.h
index f710db095..4641d1302 100644
--- a/uppsrc/TabBar/TabBar.h
+++ b/uppsrc/TabBar/TabBar.h
@@ -93,7 +93,7 @@ class TabScrollBar : public AlignedFrame
 		void Clear();
 		void Set(const TabScrollBar& t);
 		bool IsScrollable() const;
-		Callback WhenScroll;
+		Event<>  WhenScroll;
 };
 
 class TabBar : public AlignedFrame
@@ -407,14 +407,14 @@ protected:
 public:
 	typedef TabBar CLASSNAME;
 
-	Callback 					WhenHighlight;		// Executed on tab mouse-over
-	Callback 					WhenLeftDouble;		// Executed on left-button double-click (clicked tab will be the active tab)
+	Event<>  					WhenHighlight;		// Executed on tab mouse-over
+	Event<>  					WhenLeftDouble;		// Executed on left-button double-click (clicked tab will be the active tab)
 	Gate1<Value> 				CancelClose; 		// Return true to cancel action. Parameter: Key of closed tab
-	Callback1<Value>			WhenClose; 			// Executed before tab closing. Parameter: Key of closed tab
-	Gate	 					CancelCloseAll;		// Return true to cancel action;
-	Callback 		 			WhenCloseAll;		// Executed before 'Close All' action
+	Event<Value>				WhenClose; 			// Executed before tab closing. Parameter: Key of closed tab
+	Gate<>	 					CancelCloseAll;		// Return true to cancel action;
+	Event<>  		 			WhenCloseAll;		// Executed before 'Close All' action
 	Gate1<ValueArray>	     	CancelCloseSome;	// Return true to cancel action (executed with list of closing tabs)
-	Callback1<ValueArray>	    WhenCloseSome;		// Executed before any 'Close' action (with list of closing tabs)
+	Event<ValueArray>	    	WhenCloseSome;		// Executed before any 'Close' action (with list of closing tabs)
 
 	TabBar();
 	TabBar& CopyBaseSettings(const TabBar& src);
diff --git a/uppsrc/TextDiffCtrl/DiffCtrl.cpp b/uppsrc/TextDiffCtrl/DiffCtrl.cpp
index 34fd20b2c..8546ed417 100644
--- a/uppsrc/TextDiffCtrl/DiffCtrl.cpp
+++ b/uppsrc/TextDiffCtrl/DiffCtrl.cpp
@@ -120,7 +120,7 @@ void DiffDlg::Write()
 	}
 }
 
-Callback3<const String&, Vector<LineEdit::Highlight>&, const WString&> DiffDlg::WhenHighlight;
+Event<const String&, Vector<LineEdit::Highlight>&, const WString&> DiffDlg::WhenHighlight;
 
 static void sDoHighlight(Vector<LineEdit::Highlight>& hl, const WString& ln, const String *path)
 {
diff --git a/uppsrc/TextDiffCtrl/TextDiffCtrl.h b/uppsrc/TextDiffCtrl/TextDiffCtrl.h
index 9a110c644..3d62b7be2 100644
--- a/uppsrc/TextDiffCtrl/TextDiffCtrl.h
+++ b/uppsrc/TextDiffCtrl/TextDiffCtrl.h
@@ -79,9 +79,9 @@ private:
 	typedef TextCompareCtrl CLASSNAME;
 
 public:
-	Callback       WhenScroll;
-	Callback1<int> WhenLeftDouble;
-	Callback2<Vector<LineEdit::Highlight>&, const WString&> WhenHighlight;
+	Event<>        WhenScroll;
+	Event<int> WhenLeftDouble;
+	Event<Vector<LineEdit::Highlight>&, const WString&> WhenHighlight;
 
 	void           SetCount(int c);
 	void           AddCount(int c);
@@ -118,7 +118,7 @@ public:
 	void           ClearSelection()           { cursor = Null; Refresh(); }
 	void           SetSelection(int l, int h) { cursor = l; anchor = h; }
 
-	Callback       ScrollWhen(TextCompareCtrl& pair) { return THISBACK1(PairScroll, &pair); }
+	Event<>        ScrollWhen(TextCompareCtrl& pair) { return THISBACK1(PairScroll, &pair); }
 
 	TextCompareCtrl();
 };
@@ -136,8 +136,8 @@ struct TextDiffCtrl : public Splitter {
 	void SetFont(Font f, Font nf)                          { left.SetFont(f, nf); right.SetFont(f, nf); }
 	void SetFont(Font f)                                   { left.SetFont(f); right.SetFont(f); }
 	
-	Callback1<int> WhenLeftLine;
-	Callback1<int> WhenRightLine;
+	Event<int> WhenLeftLine;
+	Event<int> WhenRightLine;
 	
 	TextDiffCtrl();
 };
@@ -155,7 +155,7 @@ struct DiffDlg : public TopWindow {
 	void Write();
 	void Execute(const String& f);
 	
-	static Callback3<const String&, Vector<LineEdit::Highlight>&, const WString&> WhenHighlight;
+	static Event<const String&, Vector<LineEdit::Highlight>&, const WString&> WhenHighlight;
 	
 	DiffDlg();
 };
diff --git a/uppsrc/ide/Assist.h b/uppsrc/ide/Assist.h
index e5040618d..740046a9c 100644
--- a/uppsrc/ide/Assist.h
+++ b/uppsrc/ide/Assist.h
@@ -246,7 +246,7 @@ struct AssistEditor : CodeEditor, Navigator {
 	void           SyncNavigator();
 	void           SerializeNavigator(Stream& s);
 	
-	Callback1<int> WhenFontScroll;
+	Event<int>     WhenFontScroll;
 
 	typedef AssistEditor CLASSNAME;
 
diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp
index 5ac1d8596..f1d8d8bbe 100644
--- a/uppsrc/ide/Browser/Base.cpp
+++ b/uppsrc/ide/Browser/Base.cpp
@@ -333,7 +333,7 @@ void UpdateCodeBase(Progress& pi)
 	UpdateCodeBase2(pi);
 }
 
-void ParseSrc(Stream& in, int file, Callback2<int, const String&> error)
+void ParseSrc(Stream& in, int file, Event<int, const String&> error)
 {
 	String path = GetSourceFilePath(file);
 	CLOG("====== Parse " << file << ": " << path);
diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h
index f22d01029..9dd9de9e4 100644
--- a/uppsrc/ide/Browser/Browser.h
+++ b/uppsrc/ide/Browser/Browser.h
@@ -31,7 +31,7 @@ struct SourceFileInfo {
 };
 
 void           NewCodeBase();
-void           ParseSrc(Stream& in, int file, Callback2<int, const String&> error);
+void           ParseSrc(Stream& in, int file, Event<int, const String&> error);
 void           CodeBaseScanFile(Stream& in, const String& fn);
 void           CodeBaseScanFile(const String& fn, bool auto_check);
 void           ClearCodeBase();
@@ -143,8 +143,8 @@ struct CodeBrowser {
 	int                    range;
 	ButtonOption           rangebutton[3];
 	ButtonOption           sort;
-	Callback               WhenKeyItem;
-	Callback               WhenClear;
+	Event<>                WhenKeyItem;
+	Event<>                WhenClear;
 	
 	String             GetPm();
 	void               Load();
@@ -349,7 +349,7 @@ protected:
 	void   FixTopic();
 
 public:
-	Callback1<Bar&> WhenTemplatesMenu;
+	Event<Bar&> WhenTemplatesMenu;
 
 	enum {
 		TIMEID_AUTOSAVE = Ctrl::TIMEID_COUNT,
diff --git a/uppsrc/ide/Browser/Browser.upp b/uppsrc/ide/Browser/Browser.upp
index 2409f83a5..844230c47 100644
--- a/uppsrc/ide/Browser/Browser.upp
+++ b/uppsrc/ide/Browser/Browser.upp
@@ -14,17 +14,17 @@ file
 	Iml.cpp,
 	Sch.cpp,
 	Util.cpp,
-	Base.cpp optimize_speed,
+	Base.cpp,
 	Item.cpp,
 	ItemDisplay.cpp,
-	CodeBrowser.cpp optimize_speed,
+	CodeBrowser.cpp,
 	Browser.lay,
 	Browser.iml,
 	todo.txt,
 	Topic readonly separator,
 	TopicBase.cpp,
 	Reference.cpp,
-	File.cpp optimize_speed,
+	File.cpp,
 	Topic.cpp,
 	Template.cpp,
 	Link.cpp,
diff --git a/uppsrc/ide/Browser/Link.cpp b/uppsrc/ide/Browser/Link.cpp
index 5f554084b..e02508127 100644
--- a/uppsrc/ide/Browser/Link.cpp
+++ b/uppsrc/ide/Browser/Link.cpp
@@ -23,7 +23,7 @@ TopicLinkDlg::TopicLinkDlg()
 	const Workspace& wspc = GetIdeWorkspace();
 	for(int i = 0; i < wspc.GetCount(); i++)
 		package.Add(wspc[i]);
-	insert <<= Breaker(IDYES);
+	insert << Breaker(IDYES);
 }
 
 String TopicLinkDlg::PackageGroup(const char *name)
diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp
index 045942524..2abd2c249 100644
--- a/uppsrc/ide/Builders/Build.cpp
+++ b/uppsrc/ide/Builders/Build.cpp
@@ -262,7 +262,7 @@ struct OneFileHost : Host {
 	virtual bool   Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count) { return host->Run(cmdline, out, slot, key, blitz_count); }
 	virtual bool   Wait() { return host->Wait(); }
 	virtual bool   Wait(int slot) { return host->Wait(slot); }
-	virtual void   OnFinish(Callback cb) { return host->OnFinish(cb); }
+	virtual void   OnFinish(Event<>  cb) { return host->OnFinish(cb); }
 	virtual One<AProcess> StartProcess(const char *c) { return host->StartProcess(c); }
 	virtual void   Launch(const char *cmdline, bool) { host->Launch(cmdline); }
 	virtual void   AddFlags(Index<String>& cfg) { host->AddFlags(cfg); }
diff --git a/uppsrc/ide/Builders/Builders.h b/uppsrc/ide/Builders/Builders.h
index 36cd94c95..3792210d2 100644
--- a/uppsrc/ide/Builders/Builders.h
+++ b/uppsrc/ide/Builders/Builders.h
@@ -31,7 +31,7 @@ struct CppBuilder : Builder {
 	bool                   Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count);
 	bool                   Wait();
 	bool                   Wait(int slot);
-	void                   OnFinish(Callback cb);
+	void                   OnFinish(Event<>  cb);
 	bool                   Cp(const String& cmd, const String& package, bool& error);
 	bool                   Cd(const String& cmd);
 	Vector<String>         CustomStep(const String& path, const String& package, bool& error);
diff --git a/uppsrc/ide/Builders/CppBuilder.cpp b/uppsrc/ide/Builders/CppBuilder.cpp
index 2ae02d291..a4c168c69 100644
--- a/uppsrc/ide/Builders/CppBuilder.cpp
+++ b/uppsrc/ide/Builders/CppBuilder.cpp
@@ -124,7 +124,7 @@ bool CppBuilder::Wait(int slot)
 	return host->Wait(slot);
 }
 
-void CppBuilder::OnFinish(Callback cb)
+void CppBuilder::OnFinish(Event<>  cb)
 {
 	host->OnFinish(cb);
 }
diff --git a/uppsrc/ide/Common/Common.h b/uppsrc/ide/Common/Common.h
index 9b82e3351..bdaf050fc 100644
--- a/uppsrc/ide/Common/Common.h
+++ b/uppsrc/ide/Common/Common.h
@@ -77,7 +77,7 @@ enum {
 };
 
 void             RegisterWorkspaceConfig(const char *name);
-void             RegisterWorkspaceConfig(const char *name, Callback WhenFlush);
+void             RegisterWorkspaceConfig(const char *name, Event<>  WhenFlush);
 String&          WorkspaceConfigData(const char *name);
 
 template <class T>
diff --git a/uppsrc/ide/Common/Util.cpp b/uppsrc/ide/Common/Util.cpp
index ff12d4482..09977756b 100644
--- a/uppsrc/ide/Common/Util.cpp
+++ b/uppsrc/ide/Common/Util.cpp
@@ -78,9 +78,9 @@ VectorMap<String, String>& sWorkspaceCfg()
 	return h;
 }
 
-Vector<Callback>& sWorkspaceCfgFlush()
+Vector<Event<> >& sWorkspaceCfgFlush()
 {
-	static Vector<Callback> h;
+	static Vector<Event<> > h;
 	return h;
 }
 
@@ -90,7 +90,7 @@ void    RegisterWorkspaceConfig(const char *name)
 	sWorkspaceCfg().Add(name);
 }
 
-void    RegisterWorkspaceConfig(const char *name, Callback WhenFlush)
+void    RegisterWorkspaceConfig(const char *name, Event<>  WhenFlush)
 {
 	RegisterWorkspaceConfig(name);
 	sWorkspaceCfgFlush().Add(WhenFlush);
diff --git a/uppsrc/ide/Console.cpp b/uppsrc/ide/Console.cpp
index a3d8d0839..33f0615ed 100644
--- a/uppsrc/ide/Console.cpp
+++ b/uppsrc/ide/Console.cpp
@@ -257,7 +257,7 @@ bool Console::Run(One<AProcess> pick_ process, const char *cmdline, Stream *out,
 	return true;
 }
 
-void Console::OnFinish(Callback cb)
+void Console::OnFinish(Event<>  cb)
 {
 	Finisher& f = finisher.Add();
 	f.serial = serial;
diff --git a/uppsrc/ide/Core/Core.cpp b/uppsrc/ide/Core/Core.cpp
index a8e5c6eb6..745d1d0e4 100644
--- a/uppsrc/ide/Core/Core.cpp
+++ b/uppsrc/ide/Core/Core.cpp
@@ -210,7 +210,7 @@ bool IdeConsoleWait(int slot)
 	return the_ide && the_ide->IdeConsoleWait(slot);
 }
 
-void IdeConsoleOnFinish(Callback cb)
+void IdeConsoleOnFinish(Event<>  cb)
 {
 	if(the_ide) the_ide->IdeConsoleOnFinish(cb);
 }
diff --git a/uppsrc/ide/Core/Core.h b/uppsrc/ide/Core/Core.h
index e5d088d96..c1296d2c9 100644
--- a/uppsrc/ide/Core/Core.h
+++ b/uppsrc/ide/Core/Core.h
@@ -56,7 +56,7 @@ public:
 	virtual void             IdeConsoleEndGroup() = 0;
 	virtual bool             IdeConsoleWait() = 0;
 	virtual bool             IdeConsoleWait(int slot) = 0;
-	virtual void             IdeConsoleOnFinish(Callback cb) = 0;
+	virtual void             IdeConsoleOnFinish(Event<>  cb) = 0;
 
 	virtual bool      IdeIsDebug() const = 0;
 	virtual void      IdeEndDebug() = 0;
@@ -114,7 +114,7 @@ void             IdeConsoleBeginGroup(String group);
 void             IdeConsoleEndGroup();
 bool             IdeConsoleWait();
 bool             IdeConsoleWait(int slot);
-void             IdeConsoleOnFinish(Callback cb);
+void             IdeConsoleOnFinish(Event<>  cb);
 void             IdeGotoCodeRef(String s);
 
 String GetDefaultMethod();
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index 900e5fe44..108de5cf4 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -143,7 +143,7 @@ bool LocalHost::Wait(int slot)
 	return IdeConsoleWait(slot);
 }
 
-void LocalHost::OnFinish(Callback cb)
+void LocalHost::OnFinish(Event<>  cb)
 {
 	IdeConsoleOnFinish(cb);
 }
diff --git a/uppsrc/ide/Core/Host.h b/uppsrc/ide/Core/Host.h
index 6be6bb5f3..5a0ac990f 100644
--- a/uppsrc/ide/Core/Host.h
+++ b/uppsrc/ide/Core/Host.h
@@ -25,7 +25,7 @@ struct Host {
 	virtual bool               Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count) = 0;
 	virtual bool               Wait() = 0;
 	virtual bool               Wait(int slot) = 0;
-	virtual void               OnFinish(Callback cb) = 0;
+	virtual void               OnFinish(Event<>  cb) = 0;
 	virtual One<AProcess>      StartProcess(const char *cmdline) = 0;
 	virtual void               Launch(const char *cmdline, bool console = false) = 0;
 	virtual void               AddFlags(Index<String>& cfg) = 0;
@@ -59,7 +59,7 @@ struct LocalHost : Host {
 	virtual bool               Run(const char *cmdline, Stream& out, int slot, String key, int blitz_count);
 	virtual bool               Wait();
 	virtual bool               Wait(int slot);
-	virtual void               OnFinish(Callback cb);
+	virtual void               OnFinish(Event<>  cb);
 	virtual One<AProcess>      StartProcess(const char *cmdline);
 	virtual void               Launch(const char *cmdline, bool console);
 	virtual void               AddFlags(Index<String>& cfg);
diff --git a/uppsrc/ide/Custom.cpp b/uppsrc/ide/Custom.cpp
index 97f733b15..6b961543c 100644
--- a/uppsrc/ide/Custom.cpp
+++ b/uppsrc/ide/Custom.cpp
@@ -34,7 +34,7 @@ void Custom::InsertOut(String s) {
 void Custom::DoMenu(Button& b, Callback1<String> cb, bool cmd) {
 	if(!list.IsCursor()) return;
 	MenuBar menu;
-//	CallbackArg<String> set;
+//	Event<> Arg<String> set;
 //	set <<= cb;
 	String pk = list.Get(0);
 	String ext = (String)list.Get(2);
diff --git a/uppsrc/ide/Debuggers/Debuggers.h b/uppsrc/ide/Debuggers/Debuggers.h
index 3b80daa5b..e64b90585 100644
--- a/uppsrc/ide/Debuggers/Debuggers.h
+++ b/uppsrc/ide/Debuggers/Debuggers.h
@@ -59,8 +59,8 @@ private:
 	typedef DbgDisas CLASSNAME;
 
 public:
-	Callback WhenCursor;
-	Callback WhenFocus;
+	Event<>  WhenCursor;
+	Event<>  WhenFocus;
 
 	void  Clear();
 	void  Add(adr_t adr, const String& code, const String& args, const String& bytes = Null);
diff --git a/uppsrc/ide/Debuggers/GdbData.cpp b/uppsrc/ide/Debuggers/GdbData.cpp
index b436c8813..3cc9cbfc4 100644
--- a/uppsrc/ide/Debuggers/GdbData.cpp
+++ b/uppsrc/ide/Debuggers/GdbData.cpp
@@ -291,7 +291,7 @@ void Gdb::ClearWatches()
 
 void Gdb::QuickWatch()
 {
-	quickwatch.expression <<= quickwatch.Breaker(999);
+	quickwatch.expression << quickwatch.Breaker(999);
 	FastCmd("set print pretty on");
 	for(;;) {
 		int q = quickwatch.Run();
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
index 4334efa88..b731ea217 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
@@ -426,8 +426,8 @@ Gdb_MI2::Gdb_MI2()
 	dlock.Hide();
 
 	CtrlLayout(quickwatch, "Quick watch");
-	quickwatch.close.Cancel() <<= quickwatch.Breaker(IDCANCEL);
-	quickwatch.evaluate.Ok() <<= quickwatch.Acceptor(IDOK);
+	quickwatch.close.Cancel() << quickwatch.Breaker(IDCANCEL);
+	quickwatch.evaluate.Ok() << quickwatch.Acceptor(IDOK);
 	quickwatch.WhenClose = quickwatch.Breaker(IDCANCEL);
 	quickwatch.value.SetReadOnly();
 	quickwatch.value.SetFont(CourierZ(12));
@@ -655,8 +655,8 @@ void Gdb_MI2::SyncIde(bool fr)
 {
 	// kill pending update callbacks
 #ifndef flagMT
-	timeCallback.Kill();
-	exploreCallback.Kill();
+	timeEvent<> .Kill();
+	exploreEvent<> .Kill();
 #endif
 
 	// get current frame info and level
@@ -719,9 +719,9 @@ void Gdb_MI2::SyncIde(bool fr)
 	SyncData();
 	CleanupVariables();
 #else
-	exploreCallback.Set(480, THISBACK1(SyncExplorer, DeepClone(Vector<VarItem>())));
-	timeCallback.Set(500, THISBACK(SyncData));
-	timeCallback.Set(550, THISBACK(CleanupVariables));
+	exploreEvent<> .Set(480, THISBACK1(SyncExplorer, DeepClone(Vector<VarItem>())));
+	timeEvent<> .Set(500, THISBACK(SyncData));
+	timeEvent<> .Set(550, THISBACK(CleanupVariables));
 #endif
 }
 
@@ -1160,7 +1160,7 @@ void Gdb_MI2::SyncLocals(const Vector<VarItem>& localVars_)
 		// autos variables can come from members or locals...
 		SyncAutos();
 	
-		timeCallback.Set(500, THISBACK1(SyncLocals, DeepClone(localVars)));
+		timeEvent<> .Set(500, THISBACK1(SyncLocals, DeepClone(localVars)));
 		return;
 	}
 	
@@ -1174,7 +1174,7 @@ void Gdb_MI2::SyncLocals(const Vector<VarItem>& localVars_)
 			localValues[iLoc] = v.value;
 			locals.Set(iLoc, 1, v.value);
 			SyncAutos();
-			timeCallback.Set(100, THISBACK1(SyncLocals, DeepClone(localVars)));
+			timeEvent<> .Set(100, THISBACK1(SyncLocals, DeepClone(localVars)));
 			return;
 		}
 	}
@@ -1305,7 +1305,7 @@ void Gdb_MI2::SyncThis(const Vector<VarItem>& children_)
 		// autos variables can come from members or locals...
 		SyncAutos();
 	
-		timeCallback.Set(500, THISBACK1(SyncThis, DeepClone(children)));
+		timeEvent<> .Set(500, THISBACK1(SyncThis, DeepClone(children)));
 		return;
 	}
 	
@@ -1319,7 +1319,7 @@ void Gdb_MI2::SyncThis(const Vector<VarItem>& children_)
 			thisValues[iVar] = v.value;
 			members.Set(iVar, 1, v.value);
 			SyncAutos();
-			timeCallback.Set(100, THISBACK1(SyncThis, DeepClone(children)));
+			timeEvent<> .Set(100, THISBACK1(SyncThis, DeepClone(children)));
 			return;
 		}
 	}
@@ -1470,7 +1470,7 @@ void Gdb_MI2::SyncWatches(const Vector<VarItem>& watchesVars_)
 			watches.Set(iWatch, 1, val);
 		}
 		
-		timeCallback.Set(500, THISBACK1(SyncWatches, DeepClone(watchesVars_)));
+		timeEvent<> .Set(500, THISBACK1(SyncWatches, DeepClone(watchesVars_)));
 		return;
 	}
 	
@@ -1483,7 +1483,7 @@ void Gdb_MI2::SyncWatches(const Vector<VarItem>& watchesVars_)
 			watchesExpressions.Set(iWatch, v.evaluableExpression);
 			watchesValues[iWatch] = v.value;
 			watches.Set(iWatch, 1, v.value);
-			timeCallback.Set(100, THISBACK1(SyncWatches, DeepClone(watchesVars)));
+			timeEvent<> .Set(100, THISBACK1(SyncWatches, DeepClone(watchesVars)));
 			return;
 		}
 	}
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp b/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp
index acdd128a4..60b4c347b 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2Explore.cpp
@@ -124,7 +124,7 @@ void Gdb_MI2::SyncExplorer(const Vector<VarItem>& children_)
 		// update 'this' pane
 		FillPane(explorer, explorerExpressions, explorerValues);
 	
-		exploreCallback.Set(500, THISBACK1(SyncExplorer, DeepClone(children)));
+		exploreEvent<> .Set(500, THISBACK1(SyncExplorer, DeepClone(children)));
 		return;
 	}
 	
@@ -136,7 +136,7 @@ void Gdb_MI2::SyncExplorer(const Vector<VarItem>& children_)
 			VarItem &v = children[iVar];
 			explorer.Set(iVar, 1, v.value);
 			explorerValues[iVar] = v.value;
-			exploreCallback.Set(100, THISBACK1(SyncExplorer, DeepClone(children)));
+			exploreEvent<> .Set(100, THISBACK1(SyncExplorer, DeepClone(children)));
 			return;
 		}
 	}
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2Gdb.cpp b/uppsrc/ide/Debuggers/Gdb_MI2Gdb.cpp
index 218ad2300..2e569eb7f 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2Gdb.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2Gdb.cpp
@@ -351,7 +351,7 @@ void Gdb_MI2::CleanupVariables(void)
 	{
 		String name = debugVariables.Pop();
 		MICmd("var-delete " + name);
-		timeCallback.Set(50, THISBACK(CleanupVariables));
+		timeEvent<> .Set(50, THISBACK(CleanupVariables));
 	}
 #endif
 }
diff --git a/uppsrc/ide/SelectPkg.cpp b/uppsrc/ide/SelectPkg.cpp
index 0323bd51b..7f3d3a876 100644
--- a/uppsrc/ide/SelectPkg.cpp
+++ b/uppsrc/ide/SelectPkg.cpp
@@ -89,8 +89,8 @@ SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool mai
 	base.WhenCursor = THISBACK(OnBase);
 	base.WhenBar = THISBACK(ToolBase);
 	base.WhenLeftDouble = THISBACK(OnBaseEdit);
-	ok <<= clist.WhenLeftDouble = alist.WhenLeftDouble = THISBACK(OnOK);
-	cancel <<= WhenClose = THISBACK(OnCancel);
+	ok.WhenAction = clist.WhenLeftDouble = alist.WhenLeftDouble = THISBACK(OnOK);
+	cancel.WhenAction = WhenClose = THISBACK(OnCancel);
 	clist.Columns(4);
 	clist.WhenEnterItem = clist.WhenKillCursor = THISBACK(ListCursor);
 	alist.AddColumn("Package").Add(3);
diff --git a/uppsrc/ide/Setup.cpp b/uppsrc/ide/Setup.cpp
index a3f4336f2..e31c9662c 100644
--- a/uppsrc/ide/Setup.cpp
+++ b/uppsrc/ide/Setup.cpp
@@ -30,7 +30,7 @@ class FontSelectManager {
 	void Select();
 
 public:
-	Callback  WhenAction;
+	Event<>   WhenAction;
 
 	typedef FontSelectManager CLASSNAME;
 
@@ -487,7 +487,7 @@ void Ide::SetupFormat() {
 	hlt.hlstyle.EvenRowColor().NoHorzGrid().SetLineCy(EditField::GetStdHeight() + 2);
 	ReadHlStyles(hlt.hlstyle);
 	edt.charset <<= (int)default_charset;
-	edt.tabsize <<= rtvr <<=
+	edt.tabsize.WhenAction = rtvr <<=
 		hlt.hlstyle.WhenCtrlsAction = ed.WhenAction = tf.WhenAction =
 		con.WhenAction = f1.WhenAction = f2.WhenAction = dlg.Breaker(222);
 	ide.showtimeafter <<= Nvl((Date)FileGetTime(ConfigFile("version")), GetSysDate() - 1);
diff --git a/uppsrc/ide/SrcUpdater/SrcUpdater.h b/uppsrc/ide/SrcUpdater/SrcUpdater.h
index 05e2fcad5..137189050 100644
--- a/uppsrc/ide/SrcUpdater/SrcUpdater.h
+++ b/uppsrc/ide/SrcUpdater/SrcUpdater.h
@@ -134,7 +134,7 @@ public:
 	String GetLocal()const {return local;}
 	String GetError()const {return error;}
 	void ClearError()      {error="";}
-	Callback WhenUpdateAvailable;
+	Event<>  WhenUpdateAvailable;
 };
 
 #endif
diff --git a/uppsrc/ide/SrcUpdater/Updater.cpp b/uppsrc/ide/SrcUpdater/Updater.cpp
index 484e9a39b..80689fc71 100644
--- a/uppsrc/ide/SrcUpdater/Updater.cpp
+++ b/uppsrc/ide/SrcUpdater/Updater.cpp
@@ -179,7 +179,7 @@ void SourceUpdater::CheckLocalSvnFinished(){
 	       "[ {{5000:5000FNGN@N; [ [1 Curent local version:]]:: [ [1 "+local+"]]:: [ [1 Will update to:]]:: [ [1 "+global+"]]}}][ &&]"
 	       "[1# If you choose to update now, your local sources (directory "+DeQtf(UpdaterCfg().localsrc)+") will be compared to the files in SVN repository ("+DeQtf(UpdaterCfg().svnserver)+"). If you modified the files in your local copy, you will be able to choose appropriate actions for each changed file before writing anything on your hard drive.]";
 	UpdaterCfg().available=(ScanInt(local)<ScanInt(global));
-	LLOG("Callback chain finished: local="<<local<<", global="<<global);
+	LLOG("Event<>  chain finished: local="<<local<<", global="<<global);
 	UpdaterCfg().last=GetUtcTime();
 	StoreAsXMLFile(UpdaterCfg(),"SourceUpdater",ConfigFile("updates.xml"));
 	if(UpdaterCfg().available)
diff --git a/uppsrc/ide/SrcUpdater/Wizard.h b/uppsrc/ide/SrcUpdater/Wizard.h
index c96e1d9fa..76710475a 100644
--- a/uppsrc/ide/SrcUpdater/Wizard.h
+++ b/uppsrc/ide/SrcUpdater/Wizard.h
@@ -29,9 +29,9 @@ public:
 	typedef Wizard CLASSNAME;
 	T0 s0; T1 s1; T2 s2; T3 s3; T4 s4; T5 s5; T6 s6; T7 s7; T8 s8; T9 s9;
 	Button cancel,prev,next,finish;
-	Callback WhenFinish;
-	Callback WhenCancel;
-	Callback1<int> WhenStep;
+	Event<>  WhenFinish;
+	Event<>  WhenCancel;
+	Event<int> WhenStep;
 	Wizard();
 	void NextStep();
 	void PrevStep();
diff --git a/uppsrc/ide/Thisbacks.cpp b/uppsrc/ide/Thisbacks.cpp
index 604dee0c4..05ea4d8b3 100644
--- a/uppsrc/ide/Thisbacks.cpp
+++ b/uppsrc/ide/Thisbacks.cpp
@@ -6,7 +6,7 @@ bool IsCb(String t) {
 		t.Trim(q);
 	if(t.StartsWith("Upp::"))
 		t = t.Mid(5);
-	return  t == "Callback" || t == "Callback1" || t == "Callback2" || t == "Callback3" ||
+	return  t == "Event<> " || t == "Event<" || t == "Event<> 2" || t == "Event<> 3" ||
 	        t == "Gate" || t == "Gate1" || t == "Gate2";
 }
 
@@ -44,7 +44,7 @@ ThisbacksDlg::ThisbacksDlg(const String& scope)
 	CtrlLayoutOKCancel(*this, "THISBACKs");
 	list.AddColumn("Defined in");
 	list.AddColumn("Type");
-	list.AddColumn("Callback");
+	list.AddColumn("Event<> ");
 	list.AddColumn("Insert").Ctrls<Option>();
 	list.AddColumn("Method name").Ctrls(THISBACK(CbEdit));
 	list.SetLineCy(EditField::GetStdHeight());
diff --git a/uppsrc/ide/UppDlg.h b/uppsrc/ide/UppDlg.h
index a17fab197..55ef1b1d6 100644
--- a/uppsrc/ide/UppDlg.h
+++ b/uppsrc/ide/UppDlg.h
@@ -72,9 +72,9 @@ struct TemplateDlg : public WithNewPackageLayout<TopWindow> {
 
 	Array<PackageTemplate> pt;
 
-	Array<Label>  label;
-	Array<Ctrl>   ctrl;
-	DelayCallback delay;
+	Array<Label>   label;
+	Array<Ctrl>    ctrl;
+	DelayCallback  delay;
 
 	const PackageTemplate& ActualTemplate();
 
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 008d73e9b..c268cac56 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -86,7 +86,7 @@ protected:
 	
 	struct Finisher {
 		int               serial;
-		Callback          cb;
+		Event<>           cb;
 	};
 
 	Array<Slot> processes;
@@ -105,10 +105,10 @@ protected:
 	void FlushConsole();
 
 public:
-	Callback WhenSelect;
-	Callback1<Bar&> WhenBar;
-	Callback1<const String&> WhenLine;
-	Callback        WhenRunEnd;
+	Event<>  WhenSelect;
+	Event<Bar&> WhenBar;
+	Event<const String&> WhenLine;
+	Event<>         WhenRunEnd;
 	bool console;
 	bool verbosebuild;
 
@@ -135,7 +135,7 @@ public:
 	void Wait(int slot);
 	bool Wait();
 	
-	void OnFinish(Callback cb);
+	void OnFinish(Event<>  cb);
 
 	void WrapText(bool w)                     { wrap_text = w; }
 
@@ -202,7 +202,7 @@ private:
 	void Next();
 
 public:
-	Callback WhenTopic;
+	Event<>  WhenTopic;
 
 	void SyncDocTree();
 	void SearchWord(const String& s);
@@ -363,7 +363,7 @@ public:
 	virtual   void             IdeConsoleEndGroup();
 	virtual   bool             IdeConsoleWait();
 	virtual   bool             IdeConsoleWait(int slot);
-	virtual   void             IdeConsoleOnFinish(Callback cb);
+	virtual   void             IdeConsoleOnFinish(Event<>  cb);
 
 	virtual   bool      IdeIsDebug() const;
 	virtual   void      IdeEndDebug();
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index a676e8310..77723259b 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -172,7 +172,7 @@ bool Ide::IdeConsoleWait(int slot)
 	return true;
 }
 
-void Ide::IdeConsoleOnFinish(Callback cb)
+void Ide::IdeConsoleOnFinish(Event<>  cb)
 {
 	console.OnFinish(cb);
 }
diff --git a/uppsrc/plugin/lz4/lz4.h b/uppsrc/plugin/lz4/lz4.h
index 6013c10e7..122a99ba6 100644
--- a/uppsrc/plugin/lz4/lz4.h
+++ b/uppsrc/plugin/lz4/lz4.h
@@ -98,7 +98,7 @@ private:
 	bool          Next();
 	void          Fetch();
 
-public:	
+public:
 	bool Open(Stream& in);
 
 #ifdef _MULTITHREADED
@@ -110,20 +110,20 @@ public:
 	~LZ4DecompressStream();
 };
 
-int64  LZ4Compress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-int64  LZ4Decompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String LZ4Compress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String LZ4Compress(const String& s, EventGate<int64, int64> progress = false);
-String LZ4Decompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String LZ4Decompress(const String& s, EventGate<int64, int64> progress = false);
+int64  LZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+int64  LZ4Decompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String LZ4Compress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String LZ4Compress(const String& s, Gate<int64, int64> progress = Null);
+String LZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String LZ4Decompress(const String& s, Gate<int64, int64> progress = Null);
 
 #ifdef _MULTITHREADED
-int64  CoLZ4Compress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-int64  CoLZ4Decompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String CoLZ4Compress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String CoLZ4Compress(const String& s, EventGate<int64, int64> progress = false);
-String CoLZ4Decompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String CoLZ4Decompress(const String& s, EventGate<int64, int64> progress = false);
+int64  CoLZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+int64  CoLZ4Decompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String CoLZ4Compress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String CoLZ4Compress(const String& s, Gate<int64, int64> progress = Null);
+String CoLZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String CoLZ4Decompress(const String& s, Gate<int64, int64> progress = Null);
 #endif
 
 bool IsLZ4(Stream& s);
diff --git a/uppsrc/plugin/lz4/util.cpp b/uppsrc/plugin/lz4/util.cpp
index 5c06d1bbb..a9d62de9b 100644
--- a/uppsrc/plugin/lz4/util.cpp
+++ b/uppsrc/plugin/lz4/util.cpp
@@ -2,9 +2,9 @@
 
 namespace Upp {
 	
-void sCompressStreamCopy_(Stream& out, Stream& in, EventGate<int64, int64> progress, Stream& orig_in, int64 insz);
+void sCompressStreamCopy_(Stream& out, Stream& in, Gate<int64, int64> progress, Stream& orig_in, int64 insz);
 
-static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress, bool co)
+static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
 {
 	LZ4CompressStream outs(out);
 #ifdef _MULTITHREADED
@@ -18,7 +18,7 @@ static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, EventGate<int64,
 	return -1;
 }
 
-static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress, bool co)
+static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
 {
 	LZ4DecompressStream ins(in);
 #ifdef _MULTITHREADED
@@ -32,72 +32,72 @@ static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, EventGate<int64
 	return -1;
 }
 
-int64 LZ4Compress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 LZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sLZ4Compress(out, in, in.GetLeft(), progress, false);
 }
 
-int64 LZ4Decompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 LZ4Decompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sLZ4Decompress(out, in, in.GetLeft(), progress, false);
 }
 
-String LZ4Compress(const void *data, int64 len, EventGate<int64, int64> progress)
+String LZ4Compress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return LZ4Compress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String LZ4Compress(const String& s, EventGate<int64, int64> progress)
+String LZ4Compress(const String& s, Gate<int64, int64> progress)
 {
 	return LZ4Compress(~s, s.GetLength(), progress);
 }
 
-String LZ4Decompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String LZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return LZ4Decompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String LZ4Decompress(const String& s, EventGate<int64, int64> progress)
+String LZ4Decompress(const String& s, Gate<int64, int64> progress)
 {
 	return LZ4Decompress(~s, s.GetLength(), progress);
 }
 
 #ifdef _MULTITHREADED
 
-int64 CoLZ4Compress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 CoLZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sLZ4Compress(out, in, in.GetLeft(), progress, true);
 }
 
-int64 CoLZ4Decompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 CoLZ4Decompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sLZ4Decompress(out, in, in.GetLeft(), progress, true);
 }
 
-String CoLZ4Compress(const void *data, int64 len, EventGate<int64, int64> progress)
+String CoLZ4Compress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return CoLZ4Compress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String CoLZ4Compress(const String& s, EventGate<int64, int64> progress)
+String CoLZ4Compress(const String& s, Gate<int64, int64> progress)
 {
 	return CoLZ4Compress(~s, s.GetLength(), progress);
 }
 
-String CoLZ4Decompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String CoLZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return CoLZ4Decompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String CoLZ4Decompress(const String& s, EventGate<int64, int64> progress)
+String CoLZ4Decompress(const String& s, Gate<int64, int64> progress)
 {
 	return CoLZ4Decompress(~s, s.GetLength(), progress);
 }
diff --git a/uppsrc/plugin/pcre/RegExp.cpp b/uppsrc/plugin/pcre/RegExp.cpp
index 99704b769..5e4e1ab16 100644
--- a/uppsrc/plugin/pcre/RegExp.cpp
+++ b/uppsrc/plugin/pcre/RegExp.cpp
@@ -319,7 +319,7 @@ int RegExp::Replace(String& t, const String& r, bool backref)
 }
 
 
-int RegExp::Replace(String& t, Callback1<Vector<String>&> cbr)
+int RegExp::Replace(String& t, Event<Vector<String>&> cbr)
 {
 	String t_copy(t);
 	int count=0;
@@ -377,7 +377,7 @@ int RegExp::ReplaceGlobal(String& t, const String& r, bool backref)
 	return ReplaceGlobal(t, rv, backref);
 }
 
-int RegExp::ReplaceGlobal(String& t, Callback1<Vector<String>&> cbr)
+int RegExp::ReplaceGlobal(String& t, Event<Vector<String>&> cbr)
 {
 	String t_copy(t);
 	int count=0;
diff --git a/uppsrc/plugin/pcre/RegExp.h b/uppsrc/plugin/pcre/RegExp.h
index 8e6662eba..dc00a9d3b 100644
--- a/uppsrc/plugin/pcre/RegExp.h
+++ b/uppsrc/plugin/pcre/RegExp.h
@@ -98,11 +98,11 @@ public:
 
 	int            Replace(String& t, const Vector<String>& rv, bool backref=false);
 	int            Replace(String& t, const String& r, bool backref=false);
-	int            Replace(String& t, Callback1<Vector<String>&> cbr);
+	int            Replace(String& t, Event<Vector<String>&> cbr);
 	
 	int            ReplaceGlobal(String& t, const Vector<String>& rv, bool backref=false);
 	int            ReplaceGlobal(String& t, const String& r, bool backref=false);
-	int            ReplaceGlobal(String& t, Callback1<Vector<String>&> cbr);
+	int            ReplaceGlobal(String& t, Event<Vector<String>&> cbr);
 	
 	Vector<String> GetStrings();
 	String         GetPattern() const { return pattern; }
diff --git a/uppsrc/plugin/zip/UnZip.cpp b/uppsrc/plugin/zip/UnZip.cpp
index 4b9bbaa4a..f0d2d6958 100644
--- a/uppsrc/plugin/zip/UnZip.cpp
+++ b/uppsrc/plugin/zip/UnZip.cpp
@@ -78,7 +78,7 @@ Time UnZip::GetZipTime(dword dt)
 	return time;
 }
 
-int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip,
+int64 zPress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool gzip,
              bool compress, dword *crc, bool hdr);
 
 bool UnZip::ReadFile(Stream& out, Gate2<int, int> progress)
diff --git a/uppsrc/plugin/zip/Zip.cpp b/uppsrc/plugin/zip/Zip.cpp
index 71d9696d6..c51ff8dc6 100644
--- a/uppsrc/plugin/zip/Zip.cpp
+++ b/uppsrc/plugin/zip/Zip.cpp
@@ -10,7 +10,7 @@ void Zip::WriteFolder(const char *path, Time tm)
 	WriteFile(~p, 0, p, false, tm);
 }
 
-int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool gzip,
+int64 zPress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool gzip,
              bool compress, dword *crc, bool hdr);
 
 
diff --git a/uppsrc/plugin/zstd/Util.cpp b/uppsrc/plugin/zstd/Util.cpp
index bd12024de..95a7a92b9 100644
--- a/uppsrc/plugin/zstd/Util.cpp
+++ b/uppsrc/plugin/zstd/Util.cpp
@@ -2,9 +2,9 @@
 
 namespace Upp {
 	
-void sCompressStreamCopy_(Stream& out, Stream& in, EventGate<int64, int64> progress, Stream& orig_in, int64 insz);
+void sCompressStreamCopy_(Stream& out, Stream& in, Gate<int64, int64> progress, Stream& orig_in, int64 insz);
 
-static int64 sZstdCompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress, bool co)
+static int64 sZstdCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
 {
 	ZstdCompressStream outs(out);
 #ifdef _MULTITHREADED
@@ -18,7 +18,7 @@ static int64 sZstdCompress(Stream& out, Stream& in, int64 size, EventGate<int64,
 	return -1;
 }
 
-static int64 sZstdDecompress(Stream& out, Stream& in, int64 size, EventGate<int64, int64> progress, bool co)
+static int64 sZstdDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
 {
 	ZstdDecompressStream ins(in);
 #ifdef _MULTITHREADED
@@ -32,72 +32,72 @@ static int64 sZstdDecompress(Stream& out, Stream& in, int64 size, EventGate<int6
 	return -1;
 }
 
-int64 ZstdCompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 ZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sZstdCompress(out, in, in.GetLeft(), progress, false);
 }
 
-int64 ZstdDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 ZstdDecompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sZstdDecompress(out, in, in.GetLeft(), progress, false);
 }
 
-String ZstdCompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String ZstdCompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return ZstdCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String ZstdCompress(const String& s, EventGate<int64, int64> progress)
+String ZstdCompress(const String& s, Gate<int64, int64> progress)
 {
 	return ZstdCompress(~s, s.GetLength(), progress);
 }
 
-String ZstdDecompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String ZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return ZstdDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String ZstdDecompress(const String& s, EventGate<int64, int64> progress)
+String ZstdDecompress(const String& s, Gate<int64, int64> progress)
 {
 	return ZstdDecompress(~s, s.GetLength(), progress);
 }
 
 #ifdef _MULTITHREADED
 
-int64 CoZstdCompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 CoZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sZstdCompress(out, in, in.GetLeft(), progress, true);
 }
 
-int64 CoZstdDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress)
+int64 CoZstdDecompress(Stream& out, Stream& in, Gate<int64, int64> progress)
 {
 	return sZstdDecompress(out, in, in.GetLeft(), progress, true);
 }
 
-String CoZstdCompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String CoZstdCompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return CoZstdCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String CoZstdCompress(const String& s, EventGate<int64, int64> progress)
+String CoZstdCompress(const String& s, Gate<int64, int64> progress)
 {
 	return CoZstdCompress(~s, s.GetLength(), progress);
 }
 
-String CoZstdDecompress(const void *data, int64 len, EventGate<int64, int64> progress)
+String CoZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress)
 {
 	StringStream out;
 	MemReadStream in(data, len);
 	return CoZstdDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
 }
 
-String CoZstdDecompress(const String& s, EventGate<int64, int64> progress)
+String CoZstdDecompress(const String& s, Gate<int64, int64> progress)
 {
 	return CoZstdDecompress(~s, s.GetLength(), progress);
 }
diff --git a/uppsrc/plugin/zstd/zstd.h b/uppsrc/plugin/zstd/zstd.h
index d147decb2..95a2250ef 100644
--- a/uppsrc/plugin/zstd/zstd.h
+++ b/uppsrc/plugin/zstd/zstd.h
@@ -95,20 +95,20 @@ public:
 	~ZstdDecompressStream();
 };
 
-int64 ZstdCompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-int64 ZstdDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String ZstdCompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String ZstdCompress(const String& s, EventGate<int64, int64> progress = false);
-String ZstdDecompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String ZstdDecompress(const String& s, EventGate<int64, int64> progress = false);
+int64 ZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+int64 ZstdDecompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String ZstdCompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String ZstdCompress(const String& s, Gate<int64, int64> progress = Null);
+String ZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String ZstdDecompress(const String& s, Gate<int64, int64> progress = Null);
 
 #ifdef _MULTITHREADED
-int64 CoZstdCompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-int64 CoZstdDecompress(Stream& out, Stream& in, EventGate<int64, int64> progress = false);
-String CoZstdCompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String CoZstdCompress(const String& s, EventGate<int64, int64> progress = false);
-String CoZstdDecompress(const void *data, int64 len, EventGate<int64, int64> progress = false);
-String CoZstdDecompress(const String& s, EventGate<int64, int64> progress = false);
+int64 CoZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+int64 CoZstdDecompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
+String CoZstdCompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String CoZstdCompress(const String& s, Gate<int64, int64> progress = Null);
+String CoZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
+String CoZstdDecompress(const String& s, Gate<int64, int64> progress = Null);
 #endif
 
 bool IsZstd(Stream& s);