diff --git a/.gitignore b/.gitignore
index 1f42329c..711617fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ gtk-doc.make
 eek/eek-special-keysym-labels.h
 eek/eek-unicode-keysym-labels.h
 eek/eek-keyname-keysym-labels.h
+eek/eek-marshallers.[ch]
 eek/*.pc
 eek/*.gir
 eek/*.typelib
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index d0b236ff..a2812dbb 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -31,20 +31,20 @@ eek-$(EEK_API_VERSION).vapi:
 
 eek-clutter-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 	vapigen --vapidir=$(builddir) --library eek-clutter-$(EEK_API_VERSION) \
-		--pkg eek-0.1 --pkg clutter-1.0 \
+		--pkg eek-$(EEK_API_VERSION) --pkg clutter-1.0 \
 		eek-clutter-$(EEK_API_VERSION)/eek-clutter-$(EEK_API_VERSION).gi
 
 eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 	vapigen --vapidir=$(builddir) --library eek-gtk-$(EEK_API_VERSION) \
-		--pkg eek-0.1 --pkg gtk+-2.0 \
+		--pkg eek-$(EEK_API_VERSION) --pkg gtk+-2.0 \
 		eek-gtk-$(EEK_API_VERSION)/eek-gtk-$(EEK_API_VERSION).gi
 
 eek-xkb-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 	vapigen --vapidir=$(builddir) --library eek-xkb-$(EEK_API_VERSION) \
-		--pkg eek-0.1 \
+		--pkg eek-$(EEK_API_VERSION) \
 		eek-xkb-$(EEK_API_VERSION)/eek-xkb-$(EEK_API_VERSION).gi
 
 eek-xkl-$(EEK_API_VERSION).vapi: eek-xkb-$(EEK_API_VERSION).vapi
 	vapigen --vapidir=$(builddir) --library eek-xkl-$(EEK_API_VERSION) \
-		--pkg eek-0.1 --pkg eek-xkb-0.1 \
+		--pkg eek-$(EEK_API_VERSION) --pkg eek-xkb-$(EEK_API_VERSION) \
 		eek-xkl-$(EEK_API_VERSION)/eek-xkl-$(EEK_API_VERSION).gi
diff --git a/bindings/vala/eek-0.1/eek-0.1.files b/bindings/vala/eek-0.90/eek-0.90.files
similarity index 100%
rename from bindings/vala/eek-0.1/eek-0.1.files
rename to bindings/vala/eek-0.90/eek-0.90.files
diff --git a/bindings/vala/eek-0.1/eek-0.1.gi b/bindings/vala/eek-0.90/eek-0.90.gi
similarity index 100%
rename from bindings/vala/eek-0.1/eek-0.1.gi
rename to bindings/vala/eek-0.90/eek-0.90.gi
diff --git a/bindings/vala/eek-0.1/eek-0.1.metadata b/bindings/vala/eek-0.90/eek-0.90.metadata
similarity index 100%
rename from bindings/vala/eek-0.1/eek-0.1.metadata
rename to bindings/vala/eek-0.90/eek-0.90.metadata
diff --git a/bindings/vala/eek-0.1/eek-0.1.namespace b/bindings/vala/eek-0.90/eek-0.90.namespace
similarity index 100%
rename from bindings/vala/eek-0.1/eek-0.1.namespace
rename to bindings/vala/eek-0.90/eek-0.90.namespace
diff --git a/bindings/vala/eek-clutter-0.1/eek-clutter-0.1.files b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
similarity index 100%
rename from bindings/vala/eek-clutter-0.1/eek-clutter-0.1.files
rename to bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
diff --git a/bindings/vala/eek-clutter-0.1/eek-clutter-0.1.gi b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
similarity index 100%
rename from bindings/vala/eek-clutter-0.1/eek-clutter-0.1.gi
rename to bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
diff --git a/bindings/vala/eek-clutter-0.1/eek-clutter-0.1.metadata b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.metadata
similarity index 100%
rename from bindings/vala/eek-clutter-0.1/eek-clutter-0.1.metadata
rename to bindings/vala/eek-clutter-0.90/eek-clutter-0.90.metadata
diff --git a/bindings/vala/eek-clutter-0.1/eek-clutter-0.1.namespace b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.namespace
similarity index 100%
rename from bindings/vala/eek-clutter-0.1/eek-clutter-0.1.namespace
rename to bindings/vala/eek-clutter-0.90/eek-clutter-0.90.namespace
diff --git a/bindings/vala/eek-gtk-0.1/eek-gtk-0.1.files b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
similarity index 100%
rename from bindings/vala/eek-gtk-0.1/eek-gtk-0.1.files
rename to bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
diff --git a/bindings/vala/eek-gtk-0.1/eek-gtk-0.1.gi b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
similarity index 100%
rename from bindings/vala/eek-gtk-0.1/eek-gtk-0.1.gi
rename to bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
diff --git a/bindings/vala/eek-gtk-0.1/eek-gtk-0.1.metadata b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.metadata
similarity index 100%
rename from bindings/vala/eek-gtk-0.1/eek-gtk-0.1.metadata
rename to bindings/vala/eek-gtk-0.90/eek-gtk-0.90.metadata
diff --git a/bindings/vala/eek-gtk-0.1/eek-gtk-0.1.namespace b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.namespace
similarity index 100%
rename from bindings/vala/eek-gtk-0.1/eek-gtk-0.1.namespace
rename to bindings/vala/eek-gtk-0.90/eek-gtk-0.90.namespace
diff --git a/bindings/vala/eek-xkb-0.1/eek-xkb-0.1.files b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
similarity index 100%
rename from bindings/vala/eek-xkb-0.1/eek-xkb-0.1.files
rename to bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
diff --git a/bindings/vala/eek-xkb-0.1/eek-xkb-0.1.gi b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
similarity index 100%
rename from bindings/vala/eek-xkb-0.1/eek-xkb-0.1.gi
rename to bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
diff --git a/bindings/vala/eek-xkb-0.1/eek-xkb-0.1.metadata b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.metadata
similarity index 100%
rename from bindings/vala/eek-xkb-0.1/eek-xkb-0.1.metadata
rename to bindings/vala/eek-xkb-0.90/eek-xkb-0.90.metadata
diff --git a/bindings/vala/eek-xkb-0.1/eek-xkb-0.1.namespace b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
similarity index 100%
rename from bindings/vala/eek-xkb-0.1/eek-xkb-0.1.namespace
rename to bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
diff --git a/bindings/vala/eek-xkl-0.1/eek-xkl-0.1.files b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
similarity index 100%
rename from bindings/vala/eek-xkl-0.1/eek-xkl-0.1.files
rename to bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
diff --git a/bindings/vala/eek-xkl-0.1/eek-xkl-0.1.gi b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
similarity index 100%
rename from bindings/vala/eek-xkl-0.1/eek-xkl-0.1.gi
rename to bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
diff --git a/bindings/vala/eek-xkl-0.1/eek-xkl-0.1.metadata b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.metadata
similarity index 100%
rename from bindings/vala/eek-xkl-0.1/eek-xkl-0.1.metadata
rename to bindings/vala/eek-xkl-0.90/eek-xkl-0.90.metadata
diff --git a/bindings/vala/eek-xkl-0.1/eek-xkl-0.1.namespace b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
similarity index 100%
rename from bindings/vala/eek-xkl-0.1/eek-xkl-0.1.namespace
rename to bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
diff --git a/configure.ac b/configure.ac
index 136168b8..ac58f424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ(2.63)
 dnl AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([eekboard], [0.0.7], [ueno@unixuser.org])
+AC_INIT([eekboard], [0.90.0], [ueno@unixuser.org])
 
 dnl Init automake
 AM_INIT_AUTOMAKE
@@ -57,22 +57,18 @@ AC_MSG_RESULT([$with_gtk])
 case "$with_gtk" in
   2.0) GTK_API_VERSION=2.0
        GTK_REQUIRED=2.14.0
-       EEK_API_VERSION=0.1
+       EEK_API_VERSION=0.90
        EEK_API_MAJOR_VERSION=0
-       EEK_API_MINOR_VERSION=1
-       EEK_API_PC_VERSION=0.1
+       EEK_API_MINOR_VERSION=90
+       EEK_API_PC_VERSION=0.90
        EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
        ;;
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=2.91.0
-#       EEK_API_VERSION=0.90
-#       EEK_API_MAJOR_VERSION=0
-#       EEK_API_MINOR_VERSION=90
-#       EEK_API_PC_VERSION=0.90
-       EEK_API_VERSION=0.1
+       EEK_API_VERSION=0.90
        EEK_API_MAJOR_VERSION=0
-       EEK_API_MINOR_VERSION=1
-       EEK_API_PC_VERSION=0.1
+       EEK_API_MINOR_VERSION=90
+       EEK_API_PC_VERSION=0.90
        EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
        ;;
 esac
@@ -168,7 +164,8 @@ if test x$enable_clutter = xyes; then
   AC_DEFINE_UNQUOTED([NEED_SWAP_EVENT_WORKAROUND], $need_swap_event_workaround,
     [Define if GLX_INTEL_swap_event work around is needed])
 fi
-AM_CONDITIONAL(HAVE_CLUTTER, [test x$enable_clutter = xyes])
+dnl AM_CONDITIONAL(HAVE_CLUTTER, [test x$enable_clutter = xyes])
+AM_CONDITIONAL(HAVE_CLUTTER, [false])
 
 GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 
diff --git a/eek/eek-0.1.pc.in b/eek/eek-0.90.pc.in
similarity index 100%
rename from eek/eek-0.1.pc.in
rename to eek/eek-0.90.pc.in
diff --git a/eek/eek-clutter-0.1.pc.in b/eek/eek-clutter-0.90.pc.in
similarity index 100%
rename from eek/eek-clutter-0.1.pc.in
rename to eek/eek-clutter-0.90.pc.in
diff --git a/eek/eek-gtk-0.1.pc.in b/eek/eek-gtk-0.90.pc.in
similarity index 100%
rename from eek/eek-gtk-0.1.pc.in
rename to eek/eek-gtk-0.90.pc.in
diff --git a/eek/eek-xkb-0.1.pc.in b/eek/eek-xkb-0.90.pc.in
similarity index 100%
rename from eek/eek-xkb-0.1.pc.in
rename to eek/eek-xkb-0.90.pc.in
diff --git a/eek/eek-xkl-0.1.pc.in b/eek/eek-xkl-0.90.pc.in
similarity index 100%
rename from eek/eek-xkl-0.1.pc.in
rename to eek/eek-xkl-0.90.pc.in