diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor
index fa3dd6910f..67c8362c73 100644
--- a/basis/atk/ffi/ffi.factor
+++ b/basis/atk/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators kernel
 system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 IN: atk.ffi
 
 <<
diff --git a/basis/atk/summary.txt b/basis/atk/summary.txt
new file mode 100644
index 0000000000..951074f75c
--- /dev/null
+++ b/basis/atk/summary.txt
@@ -0,0 +1 @@
+Atk binding
diff --git a/basis/atk/tags.txt b/basis/atk/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/atk/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor
index d67f61f585..11dbbc6fdb 100644
--- a/basis/gdk/ffi/ffi.factor
+++ b/basis/gdk/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.syntax
 alien.libraries cairo.ffi combinators kernel system
-gir gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi gobject.ffi
-pango.ffi ;
+gobject-introspection gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject.ffi pango.ffi ;
 IN: gdk.ffi
 
 <<
diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index 5c57fe0013..74fa46a3b7 100644
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries combinators kernel
 system vocabs.parser words
-gir gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-gobject.ffi pango.ffi ;
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi
+gmodule.ffi gobject.ffi pango.ffi ;
 IN: gdk.gl.ffi
 
 <<
diff --git a/basis/gdk/gl/summary.txt b/basis/gdk/gl/summary.txt
new file mode 100644
index 0000000000..bf5a1e3962
--- /dev/null
+++ b/basis/gdk/gl/summary.txt
@@ -0,0 +1 @@
+GdkGLExt binding
diff --git a/basis/gdk/gl/tags.txt b/basis/gdk/gl/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gdk/gl/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor
index 12e56753e1..a87ca77c3b 100644
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gdk.pixbuf.ffi
 
diff --git a/basis/gdk/pixbuf/summary.txt b/basis/gdk/pixbuf/summary.txt
new file mode 100644
index 0000000000..6cf28e85fb
--- /dev/null
+++ b/basis/gdk/pixbuf/summary.txt
@@ -0,0 +1 @@
+GdkPixbuf binding
diff --git a/basis/gdk/pixbuf/tags.txt b/basis/gdk/pixbuf/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gdk/pixbuf/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gdk/summary.txt b/basis/gdk/summary.txt
new file mode 100644
index 0000000000..c8abd2c267
--- /dev/null
+++ b/basis/gdk/summary.txt
@@ -0,0 +1 @@
+Gdk binding
diff --git a/basis/gdk/tags.txt b/basis/gdk/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gdk/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor
index 16056f1fb5..e4d9b73fd0 100644
--- a/basis/gio/ffi/ffi.factor
+++ b/basis/gio/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gio.ffi
 
diff --git a/basis/gio/summary.txt b/basis/gio/summary.txt
new file mode 100644
index 0000000000..d21533b3b7
--- /dev/null
+++ b/basis/gio/summary.txt
@@ -0,0 +1 @@
+GIO binding
diff --git a/basis/gio/tags.txt b/basis/gio/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gio/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index a0dc3a3fdb..f5af540dfa 100644
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
-alien.libraries alien.strings alien.syntax combinators gir
-io.encodings.utf8 kernel system vocabs.parser words ;
+alien.libraries alien.strings alien.syntax combinators
+gobject-introspection io.encodings.utf8 kernel system
+vocabs.parser words ;
 IN: glib.ffi
 
 <<
diff --git a/basis/glib/summary.txt b/basis/glib/summary.txt
new file mode 100644
index 0000000000..4bb6945388
--- /dev/null
+++ b/basis/glib/summary.txt
@@ -0,0 +1 @@
+GLib binding
diff --git a/basis/glib/tags.txt b/basis/glib/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/glib/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gmodule/ffi/ffi.factor b/basis/gmodule/ffi/ffi.factor
index 449ef69249..5e3334de68 100644
--- a/basis/gmodule/ffi/ffi.factor
+++ b/basis/gmodule/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: gmodule.ffi
 
 <<
diff --git a/basis/gmodule/summary.txt b/basis/gmodule/summary.txt
new file mode 100644
index 0000000000..d5436753a8
--- /dev/null
+++ b/basis/gmodule/summary.txt
@@ -0,0 +1 @@
+GModule binding
diff --git a/basis/gmodule/tags.txt b/basis/gmodule/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gmodule/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gir/authors.txt b/basis/gobject-introspection/authors.txt
similarity index 100%
rename from basis/gir/authors.txt
rename to basis/gobject-introspection/authors.txt
diff --git a/basis/gir/common/common.factor b/basis/gobject-introspection/common/common.factor
similarity index 90%
rename from basis/gir/common/common.factor
rename to basis/gobject-introspection/common/common.factor
index d4984607b4..8bf2c7eb78 100644
--- a/basis/gir/common/common.factor
+++ b/basis/gobject-introspection/common/common.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel namespaces ;
-IN: gir.common
+IN: gobject-introspection.common
 
 CONSTANT: ffi-vocab "ffi"
 
diff --git a/basis/gir/ffi/ffi.factor b/basis/gobject-introspection/ffi/ffi.factor
similarity index 95%
rename from basis/gir/ffi/ffi.factor
rename to basis/gobject-introspection/ffi/ffi.factor
index 4ee7f35fd2..9af0186553 100644
--- a/basis/gir/ffi/ffi.factor
+++ b/basis/gobject-introspection/ffi/ffi.factor
@@ -1,11 +1,12 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.parser arrays
-classes.parser classes.struct combinators combinators.short-circuit
-definitions effects fry gir.common gir.types kernel math.parser
-namespaces parser quotations sequences sequences.generalizations words
-words.constant ;
-IN: gir.ffi
+classes.parser classes.struct combinators
+combinators.short-circuit definitions effects fry
+gobject-introspection.common gobject-introspection.types kernel
+math.parser namespaces parser quotations sequences
+sequences.generalizations words words.constant ;
+IN: gobject-introspection.ffi
 
 : string>c-type ( str -- c-type )
     parse-c-type ;
diff --git a/basis/gir/gir.factor b/basis/gobject-introspection/gobject-introspection.factor
similarity index 83%
rename from basis/gir/gir.factor
rename to basis/gobject-introspection/gobject-introspection.factor
index 3c39d8d838..f0a5a982b2 100755
--- a/basis/gir/gir.factor
+++ b/basis/gobject-introspection/gobject-introspection.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators gir.common gir.ffi gir.loader
+USING: accessors assocs combinators gobject-introspection.common
+gobject-introspection.ffi gobject-introspection.loader
 kernel lexer locals math namespaces sequences vocabs.parser xml ;
-IN: gir
+IN: gobject-introspection
 
 : with-child-vocab ( name quot -- )
     swap current-vocab name>>
diff --git a/basis/gir/loader/loader.factor b/basis/gobject-introspection/loader/loader.factor
similarity index 96%
rename from basis/gir/loader/loader.factor
rename to basis/gobject-introspection/loader/loader.factor
index 0e9ed6257f..7f0b161322 100644
--- a/basis/gir/loader/loader.factor
+++ b/basis/gobject-introspection/loader/loader.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors ascii combinators fry gir.common gir.repository
-gir.types kernel math.parser sequences splitting xml.data
-xml.traversal ;
+USING: accessors ascii combinators fry
+gobject-introspection.common gobject-introspection.repository
+gobject-introspection.types kernel math.parser sequences
+splitting xml.data xml.traversal ;
 FROM: namespaces => set get ;
-IN: gir.loader
+IN: gobject-introspection.loader
 
 SYMBOL: namespace-prefix
 SYMBOL: namespace-PREFIX
@@ -221,7 +222,6 @@ SYMBOL: namespace-PREFIX
     [ field new ] dip {
         [ "name" attr >>name ]
         [ "writable" attr "1" = >>writable? ]
-        ! Для некоторых field  есть callback в качестве типа, решить, как лучше сделать
         [
             first-child-tag dup name>> main>> "callback" =
             [ drop "gpointer" ] [ "type" attr ] if
diff --git a/basis/gir/repository/repository.factor b/basis/gobject-introspection/repository/repository.factor
similarity index 97%
rename from basis/gir/repository/repository.factor
rename to basis/gobject-introspection/repository/repository.factor
index 1ff5b2c5b4..e6b2de7193 100644
--- a/basis/gir/repository/repository.factor
+++ b/basis/gobject-introspection/repository/repository.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ;
-IN: gir.repository
+IN: gobject-introspection.repository
 
 TUPLE: node name ;
 
diff --git a/basis/gobject-introspection/summary.txt b/basis/gobject-introspection/summary.txt
new file mode 100644
index 0000000000..7be5ede755
--- /dev/null
+++ b/basis/gobject-introspection/summary.txt
@@ -0,0 +1 @@
+GObjectIntrospection support
diff --git a/basis/gir/types/types.factor b/basis/gobject-introspection/types/types.factor
similarity index 94%
rename from basis/gir/types/types.factor
rename to basis/gobject-introspection/types/types.factor
index 219eb3afff..f6d2257c79 100644
--- a/basis/gir/types/types.factor
+++ b/basis/gobject-introspection/types/types.factor
@@ -1,8 +1,10 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types assocs combinators.short-circuit
-gir.common gir.repository kernel namespaces specialized-arrays ;
-IN: gir.types
+USING: accessors alien alien.c-types assocs
+combinators.short-circuit gobject-introspection.common
+gobject-introspection.repository kernel namespaces
+specialized-arrays ;
+IN: gobject-introspection.types
 
 TUPLE: gwrapper { underlying alien } ;
 TUPLE: grecord < gwrapper ;
diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index c82ec75412..2904ceb833 100644
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 combinators kernel literals math system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gobject.ffi
 
diff --git a/basis/gobject/summary.txt b/basis/gobject/summary.txt
new file mode 100644
index 0000000000..880215cb3e
--- /dev/null
+++ b/basis/gobject/summary.txt
@@ -0,0 +1 @@
+GObject binding
diff --git a/basis/gobject/tags.txt b/basis/gobject/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gobject/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gst/Gst-0.10.gir b/basis/gstreamer/Gst-0.10.gir
similarity index 100%
rename from basis/gst/Gst-0.10.gir
rename to basis/gstreamer/Gst-0.10.gir
diff --git a/basis/gst/authors.txt b/basis/gstreamer/authors.txt
similarity index 100%
rename from basis/gst/authors.txt
rename to basis/gstreamer/authors.txt
diff --git a/basis/gst/ffi/ffi.factor b/basis/gstreamer/ffi/ffi.factor
similarity index 74%
rename from basis/gst/ffi/ffi.factor
rename to basis/gstreamer/ffi/ffi.factor
index fa110b3a5d..ac31e7d0c5 100644
--- a/basis/gst/ffi/ffi.factor
+++ b/basis/gstreamer/ffi/ffi.factor
@@ -2,12 +2,12 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.libraries combinators kernel
 system
-gir glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
-IN: gst.ffi
+IN: gstreamer.ffi
 
 <<
-"gst" {
+"gstreamer" {
     { [ os winnt? ] [ drop ] }
     { [ os macosx? ] [ drop ] }
     { [ os unix? ] [ "libgstreamer-0.10.so" cdecl add-library ] }
@@ -18,10 +18,10 @@ TYPEDEF: gpointer GstClockID
 TYPEDEF: guint64 GstClockTime
 TYPEDEF: gint64 GstClockTimeDiff
 
-! Временное исправление отсутвующих типов libxml2
+! types from libxml2
 TYPEDEF: void* xmlNodePtr
 TYPEDEF: void* xmlDocPtr
 TYPEDEF: void* xmlNsPtr
 
-GIR: vocab:gst/Gst-0.10.gir
+GIR: vocab:gstreamer/Gst-0.10.gir
 
diff --git a/basis/gst/gst.factor b/basis/gstreamer/gstreamer.factor
similarity index 71%
rename from basis/gst/gst.factor
rename to basis/gstreamer/gstreamer.factor
index 073b022b95..174fbc6dca 100644
--- a/basis/gst/gst.factor
+++ b/basis/gstreamer/gstreamer.factor
@@ -1,5 +1,5 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: gst.ffi ;
-IN: gst
+USING: gstreamer.ffi ;
+IN: gstreamer
 
diff --git a/basis/gstreamer/summary.txt b/basis/gstreamer/summary.txt
new file mode 100644
index 0000000000..4094ff9c99
--- /dev/null
+++ b/basis/gstreamer/summary.txt
@@ -0,0 +1 @@
+GStreamer binding
diff --git a/basis/gstreamer/tags.txt b/basis/gstreamer/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gstreamer/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 98ea4a408b..e649025670 100644
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 cairo.ffi combinators kernel system
-gir atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-gobject.ffi pango.ffi ;
+gobject-introspection atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi
+glib.ffi gmodule.ffi gobject.ffi pango.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.ffi
 
diff --git a/basis/gtk/gl/ffi/ffi.factor b/basis/gtk/gl/ffi/ffi.factor
index 9997ce81ad..775537063b 100644
--- a/basis/gtk/gl/ffi/ffi.factor
+++ b/basis/gtk/gl/ffi/ffi.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi glib.ffi
-gmodule.ffi gobject.ffi gtk.ffi ;
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi
+glib.ffi gmodule.ffi gobject.ffi gtk.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.gl.ffi
 
diff --git a/basis/gtk/gl/summary.txt b/basis/gtk/gl/summary.txt
new file mode 100644
index 0000000000..91afcb623d
--- /dev/null
+++ b/basis/gtk/gl/summary.txt
@@ -0,0 +1 @@
+GtkGLExt binding
diff --git a/basis/gtk/gl/tags.txt b/basis/gtk/gl/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gtk/gl/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/gtk/summary.txt b/basis/gtk/summary.txt
new file mode 100644
index 0000000000..836eaf654e
--- /dev/null
+++ b/basis/gtk/summary.txt
@@ -0,0 +1 @@
+Gtk binding
diff --git a/basis/gtk/tags.txt b/basis/gtk/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/gtk/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index 2361fe5de4..c37a08b6d6 100644
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax cairo.ffi
 combinators kernel system
-gir pango.ffi ;
+gobject-introspection pango.ffi ;
 IN: pango.cairo.ffi
 
 << 
diff --git a/basis/pango/cairo/summary.txt b/basis/pango/cairo/summary.txt
new file mode 100644
index 0000000000..8c2dacc5f0
--- /dev/null
+++ b/basis/pango/cairo/summary.txt
@@ -0,0 +1 @@
+PangoCairo binding
diff --git a/basis/pango/cairo/tags.txt b/basis/pango/cairo/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/pango/cairo/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index d174ac4488..e6c794e8bf 100644
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: pango.ffi
 
 << 
@@ -13,7 +13,7 @@ IN: pango.ffi
 } cond 
 >>
 
-TYPEDEF: void PangoLayoutRun ! не совсем верно
+TYPEDEF: void PangoLayoutRun
 TYPEDEF: guint32 PangoGlyph
 
 IMPLEMENT-STRUCTS: PangoRectangle ;
diff --git a/basis/pango/summary.txt b/basis/pango/summary.txt
new file mode 100644
index 0000000000..256187f172
--- /dev/null
+++ b/basis/pango/summary.txt
@@ -0,0 +1 @@
+Pango binding
diff --git a/basis/pango/tags.txt b/basis/pango/tags.txt
new file mode 100755
index 0000000000..bb863cf9a0
--- /dev/null
+++ b/basis/pango/tags.txt
@@ -0,0 +1 @@
+bindings
diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 57b406f6fd..fe72c6ddf5 100644
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -8,12 +8,9 @@ io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel
 libc literals locals math math.bitwise math.order math.vectors
 namespaces sequences strings system threads ui ui.backend
 ui.clipboards ui.commands ui.event-loop ui.gadgets
-ui.gadgets.menus ui.gadgets.private ui.gadgets.worlds
-ui.gestures ui.pixel-formats ui.pixel-formats.private
-ui.private ;
-RENAME: windows ui.private => ui:windows
-EXCLUDE: ui.gadgets.editors => change-caret ;
-RENAME: change-caret ui.gadgets.editors => editors:change-caret
+ui.gadgets.editors ui.gadgets.menus ui.gadgets.private
+ui.gadgets.worlds ui.gestures ui.pixel-formats
+ui.pixel-formats.private ui.private ;
 IN: ui.backend.gtk
 
 SINGLETON: gtk-ui-backend
@@ -231,7 +228,12 @@ CONSTANT: poll-fd-events
         mx get fd>> >>fd
         poll-fd-events >>events ;
 
-: init-io-event-source ( -- )
+HOOK: init-io-event-source io-backend ( -- )
+
+M: c-io-backend init-io-event-source
+    ;
+
+M: object init-io-event-source
     GSourceFuncs malloc-struct &free
         [ io-source-prepare ] GSourceFuncsPrepareFunc >>prepare
         [ io-source-check ] GSourceFuncsCheckFunc >>check
diff --git a/basis/ui/backend/gtk/summary.txt b/basis/ui/backend/gtk/summary.txt
new file mode 100644
index 0000000000..5aa0c63967
--- /dev/null
+++ b/basis/ui/backend/gtk/summary.txt
@@ -0,0 +1 @@
+Gtk-based UI backend
diff --git a/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor b/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
index c772fd11da..7508386e2c 100644
--- a/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
+++ b/extra/gir/samples/lowlevel/gstreamer/gstreamer.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.strings fry byte-arrays classes.struct
 io.encodings.utf8 kernel locals math prettyprint 
-gst.ffi glib.ffi gobject.ffi gtk.ffi ;
+gstreamer.ffi glib.ffi gobject.ffi gtk.ffi ;
 IN: gir.samples.lowlevel.gstreamer
 
 ! CONSTANT: uri "http://www.xiph.org/vorbis/listen/compilation-ogg-q4.ogg"