diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index f7749e9f..feb0ad15 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -26,13 +26,15 @@ dist_vapi_DATA = \
 MAINTAINERCLEANFILES = $(dist_vapi_DATA)
 
 eek-$(EEK_API_VERSION).vapi:
-	$(VAPIGEN_V)$(VAPIGEN) --library eek-$(EEK_API_VERSION) \
+	$(VAPIGEN_V)$(VAPIGEN) \
+		--library eek-$(EEK_API_VERSION) \
+		--pkg gio-2.0 \
 		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
 
 eek-clutter-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
 		--library eek-clutter-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) --pkg clutter-1.0 \
+		--pkg eek-$(EEK_API_VERSION) --pkg clutter-1.0 --pkg gio-2.0 --pkg atk \
 		eek-clutter-$(EEK_API_VERSION)/eek-clutter-$(EEK_API_VERSION).gi
 
 eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
@@ -44,13 +46,13 @@ eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 eek-xkb-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
 	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
 		--library eek-xkb-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) --pkg gio-2.0 \
 		eek-xkb-$(EEK_API_VERSION)/eek-xkb-$(EEK_API_VERSION).gi
 
 eek-xkl-$(EEK_API_VERSION).vapi: eek-xkb-$(EEK_API_VERSION).vapi
 	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
 		--library eek-xkl-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) --pkg eek-xkb-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) --pkg eek-xkb-$(EEK_API_VERSION) --pkg gio-2.0 \
 		eek-xkl-$(EEK_API_VERSION)/eek-xkl-$(EEK_API_VERSION).gi
 
 # set up the verbosity rules to avoid some build noise
diff --git a/bindings/vala/eek-0.90/eek-0.90.files b/bindings/vala/eek-0.90/eek-0.90.files
index 7db4944b..efbcb317 100644
--- a/bindings/vala/eek-0.90/eek-0.90.files
+++ b/bindings/vala/eek-0.90/eek-0.90.files
@@ -1,9 +1,16 @@
-include/eek-0.1/eek/eek-layout.h
-include/eek-0.1/eek/eek-element.h
-include/eek-0.1/eek/eek-container.h
-include/eek-0.1/eek/eek-keyboard.h
-include/eek-0.1/eek/eek-section.h
-include/eek-0.1/eek/eek-key.h
-include/eek-0.1/eek/eek-types.h
-include/eek-0.1/eek/eek-keysym.h
+include/eek-0.90/eek/eek-container.h
+include/eek-0.90/eek/eek-element.h
+include/eek-0.90/eek/eek-enumtypes.h
+include/eek-0.90/eek/eek-keyboard.h
+include/eek-0.90/eek/eek-key.h
+include/eek-0.90/eek/eek-keysym.h
+include/eek-0.90/eek/eek-layout.h
+include/eek-0.90/eek/eek-section.h
+include/eek-0.90/eek/eek-serializable.h
+include/eek-0.90/eek/eek-symbol.h
+include/eek-0.90/eek/eek-symbol-matrix.h
+include/eek-0.90/eek/eek-theme.h
+include/eek-0.90/eek/eek-types.h
+include/eek-0.90/eek/eek-xml.h
+include/eek-0.90/eek/eek-xml-layout.h
 lib/libeek.so
diff --git a/bindings/vala/eek-0.90/eek-0.90.gi b/bindings/vala/eek-0.90/eek-0.90.gi
index d061292e..5b63c31a 100644
--- a/bindings/vala/eek-0.90/eek-0.90.gi
+++ b/bindings/vala/eek-0.90/eek-0.90.gi
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Eek">
-		<function name="keysym_get_category" symbol="eek_keysym_get_category">
-			<return-type type="EekKeysymCategory"/>
-			<parameters>
-				<parameter name="keysym" type="guint"/>
-			</parameters>
-		</function>
-		<function name="keysym_to_string" symbol="eek_keysym_to_string">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="keysym" type="guint"/>
-			</parameters>
-		</function>
 		<callback name="EekCallback">
 			<return-type type="void"/>
 			<parameters>
@@ -27,39 +15,197 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<struct name="EekThemeClass">
+		</struct>
+		<struct name="EekThemeContext">
+		</struct>
+		<struct name="EekThemeNode">
+		</struct>
 		<boxed name="EekBounds" type-name="EekBounds" get-type="eek_bounds_get_type">
+			<method name="copy" symbol="eek_bounds_copy">
+				<return-type type="EekBounds*"/>
+				<parameters>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="eek_bounds_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</method>
 			<field name="x" type="gdouble"/>
 			<field name="y" type="gdouble"/>
 			<field name="width" type="gdouble"/>
 			<field name="height" type="gdouble"/>
 		</boxed>
-		<boxed name="EekKeysymMatrix" type-name="EekKeysymMatrix" get-type="eek_keysym_matrix_get_type">
-			<field name="data" type="guint*"/>
-			<field name="num_groups" type="gint"/>
-			<field name="num_levels" type="gint"/>
+		<boxed name="EekColor" type-name="EekColor" get-type="eek_color_get_type">
+			<method name="copy" symbol="eek_color_copy">
+				<return-type type="EekColor*"/>
+				<parameters>
+					<parameter name="color" type="EekColor*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="eek_color_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="color" type="EekColor*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_color_new">
+				<return-type type="EekColor*"/>
+				<parameters>
+					<parameter name="red" type="gdouble"/>
+					<parameter name="green" type="gdouble"/>
+					<parameter name="blue" type="gdouble"/>
+					<parameter name="alpha" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<field name="red" type="gdouble"/>
+			<field name="green" type="gdouble"/>
+			<field name="blue" type="gdouble"/>
+			<field name="alpha" type="gdouble"/>
 		</boxed>
 		<boxed name="EekOutline" type-name="EekOutline" get-type="eek_outline_get_type">
+			<method name="copy" symbol="eek_outline_copy">
+				<return-type type="EekOutline*"/>
+				<parameters>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="eek_outline_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</method>
 			<field name="corner_radius" type="gdouble"/>
 			<field name="points" type="EekPoint*"/>
 			<field name="num_points" type="gint"/>
 		</boxed>
 		<boxed name="EekPoint" type-name="EekPoint" get-type="eek_point_get_type">
+			<method name="copy" symbol="eek_point_copy">
+				<return-type type="EekPoint*"/>
+				<parameters>
+					<parameter name="point" type="EekPoint*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="eek_point_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="point" type="EekPoint*"/>
+				</parameters>
+			</method>
+			<method name="rotate" symbol="eek_point_rotate">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="point" type="EekPoint*"/>
+					<parameter name="angle" type="gint"/>
+				</parameters>
+			</method>
 			<field name="x" type="gdouble"/>
 			<field name="y" type="gdouble"/>
 		</boxed>
-		<enum name="EekKeysymCategory">
-			<member name="EEK_KEYSYM_CATEGORY_LETTER" value="0"/>
-			<member name="EEK_KEYSYM_CATEGORY_FUNCTION" value="1"/>
-			<member name="EEK_KEYSYM_CATEGORY_KEYNAME" value="2"/>
-			<member name="EEK_KEYSYM_CATEGORY_UNKNOWN" value="3"/>
-			<member name="EEK_KEYSYM_CATEGORY_LAST" value="3"/>
+		<boxed name="EekSymbolMatrix" type-name="EekSymbolMatrix" get-type="eek_symbol_matrix_get_type">
+			<method name="copy" symbol="eek_symbol_matrix_copy">
+				<return-type type="EekSymbolMatrix*"/>
+				<parameters>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="eek_symbol_matrix_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
+				</parameters>
+			</method>
+			<method name="get_symbol" symbol="eek_symbol_matrix_get_symbol">
+				<return-type type="EekSymbol*"/>
+				<parameters>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_symbol_matrix_new">
+				<return-type type="EekSymbolMatrix*"/>
+				<parameters>
+					<parameter name="num_groups" type="gint"/>
+					<parameter name="num_levels" type="gint"/>
+				</parameters>
+			</constructor>
+			<method name="set_symbol" symbol="eek_symbol_matrix_set_symbol">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+					<parameter name="symbol" type="EekSymbol*"/>
+				</parameters>
+			</method>
+			<field name="num_groups" type="gint"/>
+			<field name="num_levels" type="gint"/>
+			<field name="data" type="EekSymbol**"/>
+		</boxed>
+		<enum name="EekGradientType" type-name="EekGradientType" get-type="eek_gradient_type_get_type">
+			<member name="EEK_GRADIENT_NONE" value="0"/>
+			<member name="EEK_GRADIENT_VERTICAL" value="1"/>
+			<member name="EEK_GRADIENT_HORIZONTAL" value="2"/>
+			<member name="EEK_GRADIENT_RADIAL" value="3"/>
 		</enum>
-		<enum name="EekOrientation">
+		<enum name="EekModifierBehavior" type-name="EekModifierBehavior" get-type="eek_modifier_behavior_get_type">
+			<member name="EEK_MODIFIER_BEHAVIOR_NONE" value="0"/>
+			<member name="EEK_MODIFIER_BEHAVIOR_LOCK" value="1"/>
+			<member name="EEK_MODIFIER_BEHAVIOR_LATCH" value="2"/>
+		</enum>
+		<enum name="EekOrientation" type-name="EekOrientation" get-type="eek_orientation_get_type">
 			<member name="EEK_ORIENTATION_VERTICAL" value="0"/>
 			<member name="EEK_ORIENTATION_HORIZONTAL" value="1"/>
 			<member name="EEK_ORIENTATION_INVALID" value="-1"/>
 		</enum>
+		<enum name="EekSymbolCategory" type-name="EekSymbolCategory" get-type="eek_symbol_category_get_type">
+			<member name="EEK_SYMBOL_CATEGORY_LETTER" value="0"/>
+			<member name="EEK_SYMBOL_CATEGORY_FUNCTION" value="1"/>
+			<member name="EEK_SYMBOL_CATEGORY_KEYNAME" value="2"/>
+			<member name="EEK_SYMBOL_CATEGORY_USER0" value="3"/>
+			<member name="EEK_SYMBOL_CATEGORY_USER1" value="4"/>
+			<member name="EEK_SYMBOL_CATEGORY_USER2" value="5"/>
+			<member name="EEK_SYMBOL_CATEGORY_USER3" value="6"/>
+			<member name="EEK_SYMBOL_CATEGORY_USER4" value="7"/>
+			<member name="EEK_SYMBOL_CATEGORY_UNKNOWN" value="8"/>
+			<member name="EEK_SYMBOL_CATEGORY_LAST" value="8"/>
+		</enum>
+		<flags name="EekModifierType" type-name="EekModifierType" get-type="eek_modifier_type_get_type">
+			<member name="EEK_SHIFT_MASK" value="1"/>
+			<member name="EEK_LOCK_MASK" value="2"/>
+			<member name="EEK_CONTROL_MASK" value="4"/>
+			<member name="EEK_MOD1_MASK" value="8"/>
+			<member name="EEK_MOD2_MASK" value="16"/>
+			<member name="EEK_MOD3_MASK" value="32"/>
+			<member name="EEK_MOD4_MASK" value="64"/>
+			<member name="EEK_MOD5_MASK" value="128"/>
+			<member name="EEK_BUTTON1_MASK" value="256"/>
+			<member name="EEK_BUTTON2_MASK" value="512"/>
+			<member name="EEK_BUTTON3_MASK" value="1024"/>
+			<member name="EEK_BUTTON4_MASK" value="2048"/>
+			<member name="EEK_BUTTON5_MASK" value="4096"/>
+			<member name="EEK_SUPER_MASK" value="67108864"/>
+			<member name="EEK_HYPER_MASK" value="134217728"/>
+			<member name="EEK_META_MASK" value="268435456"/>
+			<member name="EEK_RELEASE_MASK" value="1073741824"/>
+			<member name="EEK_MODIFIER_MASK" value="1543512063"/>
+		</flags>
 		<object name="EekContainer" parent="EekElement" type-name="EekContainer" get-type="eek_container_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
+			<method name="add_child" symbol="eek_container_add_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="container" type="EekContainer*"/>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</method>
 			<method name="find" symbol="eek_container_find">
 				<return-type type="EekElement*"/>
 				<parameters>
@@ -68,14 +214,6 @@
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
-			<method name="find_by_position" symbol="eek_container_find_by_position">
-				<return-type type="EekElement*"/>
-				<parameters>
-					<parameter name="container" type="EekContainer*"/>
-					<parameter name="x" type="gdouble"/>
-					<parameter name="y" type="gdouble"/>
-				</parameters>
-			</method>
 			<method name="foreach_child" symbol="eek_container_foreach_child">
 				<return-type type="void"/>
 				<parameters>
@@ -110,7 +248,7 @@
 				<parameters>
 					<parameter name="self" type="EekContainer*"/>
 					<parameter name="func" type="EekCompareFunc"/>
-					<parameter name="user_data" type="gpointer"/>
+					<parameter name="data" type="gpointer"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="foreach_child">
@@ -129,7 +267,10 @@
 				</parameters>
 			</vfunc>
 		</object>
-		<object name="EekElement" parent="GInitiallyUnowned" type-name="EekElement" get-type="eek_element_get_type">
+		<object name="EekElement" parent="GObject" type-name="EekElement" get-type="eek_element_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
 			<method name="get_absolute_position" symbol="eek_element_get_absolute_position">
 				<return-type type="void"/>
 				<parameters>
@@ -145,6 +286,18 @@
 					<parameter name="bounds" type="EekBounds*"/>
 				</parameters>
 			</method>
+			<method name="get_group" symbol="eek_element_get_group">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</method>
+			<method name="get_level" symbol="eek_element_get_level">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</method>
 			<method name="get_name" symbol="eek_element_get_name">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -157,6 +310,14 @@
 					<parameter name="element" type="EekElement*"/>
 				</parameters>
 			</method>
+			<method name="get_symbol_index" symbol="eek_element_get_symbol_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="set_bounds" symbol="eek_element_set_bounds">
 				<return-type type="void"/>
 				<parameters>
@@ -164,6 +325,20 @@
 					<parameter name="bounds" type="EekBounds*"/>
 				</parameters>
 			</method>
+			<method name="set_group" symbol="eek_element_set_group">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="group" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_level" symbol="eek_element_set_level">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_name" symbol="eek_element_set_name">
 				<return-type type="void"/>
 				<parameters>
@@ -178,8 +353,42 @@
 					<parameter name="parent" type="EekElement*"/>
 				</parameters>
 			</method>
+			<method name="set_position" symbol="eek_element_set_position">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="set_size" symbol="eek_element_set_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="set_symbol_index" symbol="eek_element_set_symbol_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
 			<property name="bounds" type="EekBounds*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="group" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="level" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="symbol-index-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</signal>
 			<vfunc name="get_bounds">
 				<return-type type="void"/>
 				<parameters>
@@ -199,6 +408,14 @@
 					<parameter name="self" type="EekElement*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_symbol_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="set_bounds">
 				<return-type type="void"/>
 				<parameters>
@@ -220,8 +437,19 @@
 					<parameter name="parent" type="EekElement*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="set_symbol_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</vfunc>
 		</object>
 		<object name="EekKey" parent="EekElement" type-name="EekKey" get-type="eek_key_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
 			<method name="get_index" symbol="eek_key_get_index">
 				<return-type type="void"/>
 				<parameters>
@@ -236,31 +464,44 @@
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</method>
-			<method name="get_keysym" symbol="eek_key_get_keysym">
-				<return-type type="guint"/>
+			<method name="get_oref" symbol="eek_key_get_oref">
+				<return-type type="gulong"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</method>
-			<method name="get_keysym_index" symbol="eek_key_get_keysym_index">
-				<return-type type="void"/>
+			<method name="get_symbol" symbol="eek_key_get_symbol">
+				<return-type type="EekSymbol*"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
-					<parameter name="group" type="gint*"/>
-					<parameter name="level" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_keysyms" symbol="eek_key_get_keysyms">
-				<return-type type="void"/>
+			<method name="get_symbol_at_index" symbol="eek_key_get_symbol_at_index">
+				<return-type type="EekSymbol*"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
-					<parameter name="keysyms" type="guint**"/>
-					<parameter name="num_groups" type="gint*"/>
-					<parameter name="num_levels" type="gint*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+					<parameter name="fallback_group" type="gint"/>
+					<parameter name="fallback_level" type="gint"/>
 				</parameters>
 			</method>
-			<method name="get_outline" symbol="eek_key_get_outline">
-				<return-type type="EekOutline*"/>
+			<method name="get_symbol_matrix" symbol="eek_key_get_symbol_matrix">
+				<return-type type="EekSymbolMatrix*"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</method>
+			<method name="get_symbol_with_fallback" symbol="eek_key_get_symbol_with_fallback">
+				<return-type type="EekSymbol*"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="fallback_group" type="gint"/>
+					<parameter name="fallback_level" type="gint"/>
+				</parameters>
+			</method>
+			<method name="is_pressed" symbol="eek_key_is_pressed">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
@@ -280,44 +521,32 @@
 					<parameter name="keycode" type="guint"/>
 				</parameters>
 			</method>
-			<method name="set_keysym_index" symbol="eek_key_set_keysym_index">
+			<method name="set_oref" symbol="eek_key_set_oref">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
-					<parameter name="group" type="gint"/>
-					<parameter name="level" type="gint"/>
+					<parameter name="oref" type="gulong"/>
 				</parameters>
 			</method>
-			<method name="set_keysyms" symbol="eek_key_set_keysyms">
+			<method name="set_symbol_matrix" symbol="eek_key_set_symbol_matrix">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
-					<parameter name="keysyms" type="guint*"/>
-					<parameter name="num_groups" type="gint"/>
-					<parameter name="num_levels" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_outline" symbol="eek_key_set_outline">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="key" type="EekKey*"/>
-					<parameter name="outline" type="EekOutline*"/>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
 				</parameters>
 			</method>
 			<property name="column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="group" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="keycode" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="keysyms" type="EekKeysymMatrix*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="level" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="outline" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="oref" type="gulong" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="row" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="symbol-matrix" type="EekSymbolMatrix*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="pressed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
-			<signal name="released" when="FIRST">
+			<signal name="released" when="LAST">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="key" type="EekKey*"/>
@@ -337,31 +566,20 @@
 					<parameter name="self" type="EekKey*"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="get_keysym">
-				<return-type type="guint"/>
+			<vfunc name="get_oref">
+				<return-type type="gulong"/>
 				<parameters>
 					<parameter name="self" type="EekKey*"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="get_keysym_index">
-				<return-type type="void"/>
+			<vfunc name="get_symbol_matrix">
+				<return-type type="EekSymbolMatrix*"/>
 				<parameters>
 					<parameter name="self" type="EekKey*"/>
-					<parameter name="group" type="gint*"/>
-					<parameter name="level" type="gint*"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="get_keysyms">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekKey*"/>
-					<parameter name="keysyms" type="guint**"/>
-					<parameter name="num_groups" type="gint*"/>
-					<parameter name="num_levels" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_outline">
-				<return-type type="EekOutline*"/>
+			<vfunc name="is_pressed">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="self" type="EekKey*"/>
 				</parameters>
@@ -381,32 +599,32 @@
 					<parameter name="keycode" type="guint"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="set_keysym_index">
+			<vfunc name="set_oref">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="self" type="EekKey*"/>
-					<parameter name="group" type="gint"/>
-					<parameter name="level" type="gint"/>
+					<parameter name="oref" type="gulong"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="set_keysyms">
+			<vfunc name="set_symbol_matrix">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="self" type="EekKey*"/>
-					<parameter name="keysyms" type="guint*"/>
-					<parameter name="num_groups" type="gint"/>
-					<parameter name="num_levels" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_outline">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekKey*"/>
-					<parameter name="outline" type="EekOutline*"/>
+					<parameter name="matrix" type="EekSymbolMatrix*"/>
 				</parameters>
 			</vfunc>
 		</object>
 		<object name="EekKeyboard" parent="EekContainer" type-name="EekKeyboard" get-type="eek_keyboard_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
+			<method name="add_outline" symbol="eek_keyboard_add_outline">
+				<return-type type="gulong"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</method>
 			<method name="create_section" symbol="eek_keyboard_create_section">
 				<return-type type="EekSection*"/>
 				<parameters>
@@ -420,7 +638,64 @@
 					<parameter name="keycode" type="guint"/>
 				</parameters>
 			</method>
-			<method name="get_keysym_index" symbol="eek_keyboard_get_keysym_index">
+			<method name="get_alt_gr_mask" symbol="eek_keyboard_get_alt_gr_mask">
+				<return-type type="EekModifierType"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_group" symbol="eek_keyboard_get_group">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_layout" symbol="eek_keyboard_get_layout">
+				<return-type type="EekLayout*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_level" symbol="eek_keyboard_get_level">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_modifier_behavior" symbol="eek_keyboard_get_modifier_behavior">
+				<return-type type="EekModifierBehavior"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_modifiers" symbol="eek_keyboard_get_modifiers">
+				<return-type type="EekModifierType"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_num_lock_mask" symbol="eek_keyboard_get_num_lock_mask">
+				<return-type type="EekModifierType"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_outline" symbol="eek_keyboard_get_outline">
+				<return-type type="EekOutline*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="oref" type="gulong"/>
+				</parameters>
+			</method>
+			<method name="get_size" symbol="eek_keyboard_get_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="width" type="gdouble*"/>
+					<parameter name="height" type="gdouble*"/>
+				</parameters>
+			</method>
+			<method name="get_symbol_index" symbol="eek_keyboard_get_symbol_index">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="keyboard" type="EekKeyboard*"/>
@@ -428,13 +703,66 @@
 					<parameter name="level" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="realize" symbol="eek_keyboard_realize">
+			<constructor name="new" symbol="eek_keyboard_new">
+				<return-type type="EekKeyboard*"/>
+				<parameters>
+					<parameter name="layout" type="EekLayout*"/>
+					<parameter name="initial_width" type="gdouble"/>
+					<parameter name="initial_height" type="gdouble"/>
+				</parameters>
+			</constructor>
+			<method name="output" symbol="eek_keyboard_output">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="output" type="GString*"/>
+					<parameter name="indent" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_keysym_index" symbol="eek_keyboard_set_keysym_index">
+			<method name="set_alt_gr_mask" symbol="eek_keyboard_set_alt_gr_mask">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="alt_gr_mask" type="EekModifierType"/>
+				</parameters>
+			</method>
+			<method name="set_group" symbol="eek_keyboard_set_group">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="group" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_level" symbol="eek_keyboard_set_level">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_modifier_behavior" symbol="eek_keyboard_set_modifier_behavior">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="modifier_behavior" type="EekModifierBehavior"/>
+				</parameters>
+			</method>
+			<method name="set_num_lock_mask" symbol="eek_keyboard_set_num_lock_mask">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="num_lock_mask" type="EekModifierType"/>
+				</parameters>
+			</method>
+			<method name="set_size" symbol="eek_keyboard_set_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="width" type="gdouble"/>
+					<parameter name="height" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="set_symbol_index" symbol="eek_keyboard_set_symbol_index">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="keyboard" type="EekKeyboard*"/>
@@ -442,27 +770,20 @@
 					<parameter name="level" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_layout" symbol="eek_keyboard_set_layout">
+			<property name="layout" type="EekLayout*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="modifier-behavior" type="EekModifierBehavior" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="key-pressed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="keyboard" type="EekKeyboard*"/>
-					<parameter name="layout" type="EekLayout*"/>
-				</parameters>
-			</method>
-			<property name="group" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="level" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="key-pressed" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="EekKeyboard*"/>
-					<parameter name="p0" type="EekKey*"/>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
-			<signal name="key-released" when="FIRST">
+			<signal name="key-released" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="EekKeyboard*"/>
-					<parameter name="p0" type="EekKey*"/>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
 			<vfunc name="create_section">
@@ -478,37 +799,51 @@
 					<parameter name="keycode" type="guint"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="get_keysym_index">
-				<return-type type="void"/>
+		</object>
+		<object name="EekKeysym" parent="EekSymbol" type-name="EekKeysym" get-type="eek_keysym_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
+			<method name="get_xkeysym" symbol="eek_keysym_get_xkeysym">
+				<return-type type="guint"/>
 				<parameters>
-					<parameter name="self" type="EekKeyboard*"/>
-					<parameter name="group" type="gint*"/>
-					<parameter name="level" type="gint*"/>
+					<parameter name="keysym" type="EekKeysym*"/>
 				</parameters>
-			</vfunc>
-			<vfunc name="realize">
-				<return-type type="void"/>
+			</method>
+			<constructor name="new" symbol="eek_keysym_new">
+				<return-type type="EekKeysym*"/>
 				<parameters>
-					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="xkeysym" type="guint"/>
 				</parameters>
-			</vfunc>
-			<vfunc name="set_keysym_index">
-				<return-type type="void"/>
+			</constructor>
+			<constructor name="new_from_name" symbol="eek_keysym_new_from_name">
+				<return-type type="EekKeysym*"/>
 				<parameters>
-					<parameter name="self" type="EekKeyboard*"/>
-					<parameter name="group" type="gint"/>
-					<parameter name="level" type="gint"/>
+					<parameter name="name" type="gchar*"/>
 				</parameters>
-			</vfunc>
-			<vfunc name="set_layout">
-				<return-type type="void"/>
+			</constructor>
+			<constructor name="new_with_modifier" symbol="eek_keysym_new_with_modifier">
+				<return-type type="EekKeysym*"/>
 				<parameters>
-					<parameter name="self" type="EekKeyboard*"/>
-					<parameter name="layout" type="EekLayout*"/>
+					<parameter name="xkeysym" type="guint"/>
+					<parameter name="modifier" type="EekModifierType"/>
+				</parameters>
+			</constructor>
+		</object>
+		<object name="EekLayout" parent="GObject" type-name="EekLayout" get-type="eek_layout_get_type">
+			<vfunc name="create_keyboard">
+				<return-type type="EekKeyboard*"/>
+				<parameters>
+					<parameter name="self" type="EekLayout*"/>
+					<parameter name="initial_width" type="gdouble"/>
+					<parameter name="initial_height" type="gdouble"/>
 				</parameters>
 			</vfunc>
 		</object>
 		<object name="EekSection" parent="EekContainer" type-name="EekSection" get-type="eek_section_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
 			<method name="add_row" symbol="eek_section_add_row">
 				<return-type type="void"/>
 				<parameters>
@@ -561,18 +896,18 @@
 				</parameters>
 			</method>
 			<property name="angle" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="key-pressed" when="FIRST">
+			<signal name="key-pressed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="EekSection*"/>
-					<parameter name="p0" type="EekKey*"/>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
-			<signal name="key-released" when="FIRST">
+			<signal name="key-released" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="EekSection*"/>
-					<parameter name="p0" type="EekKey*"/>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
 			<vfunc name="add_row">
@@ -627,54 +962,187 @@
 				</parameters>
 			</vfunc>
 		</object>
-		<interface name="EekLayout" type-name="EekLayout" get-type="eek_layout_get_type">
-			<method name="apply" symbol="eek_layout_apply">
-				<return-type type="void"/>
+		<object name="EekSymbol" parent="GObject" type-name="EekSymbol" get-type="eek_symbol_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
+			<method name="get_category" symbol="eek_symbol_get_category">
+				<return-type type="EekSymbolCategory"/>
 				<parameters>
-					<parameter name="layout" type="EekLayout*"/>
-					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
 				</parameters>
 			</method>
-			<method name="get_group" symbol="eek_layout_get_group">
-				<return-type type="gint"/>
+			<method name="get_icon_name" symbol="eek_symbol_get_icon_name">
+				<return-type type="gchar*"/>
 				<parameters>
-					<parameter name="layout" type="EekLayout*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
 				</parameters>
 			</method>
-			<signal name="changed" when="FIRST">
-				<return-type type="void"/>
+			<method name="get_label" symbol="eek_symbol_get_label">
+				<return-type type="gchar*"/>
 				<parameters>
-					<parameter name="self" type="EekLayout*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
 				</parameters>
-			</signal>
-			<signal name="group-changed" when="FIRST">
-				<return-type type="void"/>
+			</method>
+			<method name="get_modifier_mask" symbol="eek_symbol_get_modifier_mask">
+				<return-type type="EekModifierType"/>
 				<parameters>
-					<parameter name="self" type="EekLayout*"/>
-					<parameter name="group" type="gint"/>
+					<parameter name="keysym" type="EekSymbol*"/>
 				</parameters>
-			</signal>
-			<vfunc name="apply">
+			</method>
+			<method name="get_name" symbol="eek_symbol_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="symbol" type="EekSymbol*"/>
+				</parameters>
+			</method>
+			<method name="is_modifier" symbol="eek_symbol_is_modifier">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="symbol" type="EekSymbol*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_symbol_new">
+				<return-type type="EekSymbol*"/>
+				<parameters>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<method name="set_category" symbol="eek_symbol_set_category">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="EekLayout*"/>
-					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
+					<parameter name="category" type="EekSymbolCategory"/>
+				</parameters>
+			</method>
+			<method name="set_icon_name" symbol="eek_symbol_set_icon_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="symbol" type="EekSymbol*"/>
+					<parameter name="icon_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_label" symbol="eek_symbol_set_label">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="symbol" type="EekSymbol*"/>
+					<parameter name="label" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_modifier_mask" symbol="eek_symbol_set_modifier_mask">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keysym" type="EekSymbol*"/>
+					<parameter name="mask" type="EekModifierType"/>
+				</parameters>
+			</method>
+			<method name="set_name" symbol="eek_symbol_set_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="symbol" type="EekSymbol*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<property name="category" type="EekSymbolCategory" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="icon-name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="modifier-mask" type="EekModifierType" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+		</object>
+		<object name="EekTheme" parent="GObject" type-name="EekTheme" get-type="eek_theme_get_type">
+			<method name="load_stylesheet" symbol="eek_theme_load_stylesheet">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="theme" type="EekTheme*"/>
+					<parameter name="path" type="char*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_theme_new">
+				<return-type type="EekTheme*"/>
+				<parameters>
+					<parameter name="application_stylesheet" type="char*"/>
+					<parameter name="theme_stylesheet" type="char*"/>
+					<parameter name="default_stylesheet" type="char*"/>
+				</parameters>
+			</constructor>
+			<method name="unload_stylesheet" symbol="eek_theme_unload_stylesheet">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="theme" type="EekTheme*"/>
+					<parameter name="path" type="char*"/>
+				</parameters>
+			</method>
+			<property name="application-stylesheet" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="default-stylesheet" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="theme-stylesheet" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="EekXmlLayout" parent="EekLayout" type-name="EekXmlLayout" get-type="eek_xml_layout_get_type">
+			<method name="get_source" symbol="eek_xml_layout_get_source">
+				<return-type type="GInputStream*"/>
+				<parameters>
+					<parameter name="layout" type="EekXmlLayout*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_xml_layout_new">
+				<return-type type="EekLayout*"/>
+				<parameters>
+					<parameter name="source" type="GInputStream*"/>
+				</parameters>
+			</constructor>
+			<method name="set_source" symbol="eek_xml_layout_set_source">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="layout" type="EekXmlLayout*"/>
+					<parameter name="source" type="GInputStream*"/>
+				</parameters>
+			</method>
+			<property name="source" type="GInputStream*" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
+		<interface name="EekSerializable" type-name="EekSerializable" get-type="eek_serializable_get_type">
+			<method name="deserialize" symbol="eek_serializable_deserialize">
+				<return-type type="EekSerializable*"/>
+				<parameters>
+					<parameter name="variant" type="GVariant*"/>
+				</parameters>
+			</method>
+			<method name="serialize" symbol="eek_serializable_serialize">
+				<return-type type="GVariant*"/>
+				<parameters>
+					<parameter name="object" type="EekSerializable*"/>
+				</parameters>
+			</method>
+			<vfunc name="deserialize">
+				<return-type type="gsize"/>
+				<parameters>
+					<parameter name="object" type="EekSerializable*"/>
+					<parameter name="variant" type="GVariant*"/>
+					<parameter name="index" type="gsize"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="get_group">
-				<return-type type="gint"/>
+			<vfunc name="serialize">
+				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="EekLayout*"/>
+					<parameter name="object" type="EekSerializable*"/>
+					<parameter name="builder" type="GVariantBuilder*"/>
 				</parameters>
 			</vfunc>
 		</interface>
 		<constant name="EEK_CONTAINER_H" type="int" value="1"/>
 		<constant name="EEK_ELEMENT_H" type="int" value="1"/>
+		<constant name="EEK_INVALID_KEYCODE" type="int" value="0"/>
+		<constant name="EEK_INVALID_KEYSYM" type="int" value="0"/>
 		<constant name="EEK_KEYBOARD_H" type="int" value="1"/>
 		<constant name="EEK_KEYSYM_H" type="int" value="1"/>
 		<constant name="EEK_KEY_H" type="int" value="1"/>
 		<constant name="EEK_LAYOUT_H" type="int" value="1"/>
 		<constant name="EEK_SECTION_H" type="int" value="1"/>
+		<constant name="EEK_SERIALIZABLE_H" type="int" value="1"/>
+		<constant name="EEK_SYMBOL_H" type="int" value="1"/>
+		<constant name="EEK_SYMBOL_MATRIX_H" type="int" value="1"/>
 		<constant name="EEK_TYPES_H" type="int" value="1"/>
+		<constant name="EEK_XML_H" type="int" value="1"/>
+		<constant name="EEK_XML_LAYOUT_H" type="int" value="1"/>
+		<constant name="EEK_XML_SCHEMA_VERSION" type="char*" value="0.90"/>
 	</namespace>
 </api>
diff --git a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
index c047a56a..b50c0885 100644
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
@@ -1,6 +1,2 @@
-include/eek-0.1/eek/eek-clutter-keyboard.h
-include/eek-0.1/eek/eek-clutter-section.h
-include/eek-0.1/eek/eek-clutter-key.h
-include/eek-0.1/eek/eek-clutter-drawing-context.h
+include/eek-0.90/eek/eek-clutter-keyboard.h
 lib/libeek-clutter.so
-
diff --git a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
index 346b3763..a1152037 100644
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
@@ -1,85 +1,28 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="EekClutter">
-		<object name="EekClutterDrawingContext" parent="GInitiallyUnowned" type-name="EekClutterDrawingContext" get-type="eek_clutter_drawing_context_get_type">
-			<method name="get_category_font" symbol="eek_clutter_drawing_context_get_category_font">
-				<return-type type="PangoFontDescription*"/>
-				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-					<parameter name="category" type="EekKeysymCategory"/>
-				</parameters>
-			</method>
-			<method name="get_outline_texture" symbol="eek_clutter_drawing_context_get_outline_texture">
+		<object name="EekClutterKeyboard" parent="ClutterGroup" type-name="EekClutterKeyboard" get-type="eek_clutter_keyboard_get_type">
+			<implements>
+				<interface name="ClutterScriptable"/>
+				<interface name="ClutterAnimatable"/>
+				<interface name="AtkImplementor"/>
+				<interface name="ClutterContainer"/>
+			</implements>
+			<constructor name="new" symbol="eek_clutter_keyboard_new">
 				<return-type type="ClutterActor*"/>
 				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-					<parameter name="outline" type="EekOutline*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eek_clutter_drawing_context_new">
-				<return-type type="EekClutterDrawingContext*"/>
-			</constructor>
-			<method name="set_category_font" symbol="eek_clutter_drawing_context_set_category_font">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-					<parameter name="category" type="EekKeysymCategory"/>
-					<parameter name="fonts" type="PangoFontDescription*"/>
-				</parameters>
-			</method>
-			<method name="set_outline_texture" symbol="eek_clutter_drawing_context_set_outline_texture">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-					<parameter name="outline" type="EekOutline*"/>
-					<parameter name="texture" type="ClutterActor*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="EekClutterKey" parent="EekKey" type-name="EekClutterKey" get-type="eek_clutter_key_get_type">
-			<method name="get_actor" symbol="eek_clutter_key_get_actor">
-				<return-type type="ClutterActor*"/>
-				<parameters>
-					<parameter name="key" type="EekClutterKey*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eek_clutter_key_new">
-				<return-type type="EekKey*"/>
-				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-					<parameter name="column" type="gint"/>
-					<parameter name="row" type="gint"/>
+					<parameter name="keyboard" type="EekKeyboard*"/>
 				</parameters>
 			</constructor>
-		</object>
-		<object name="EekClutterKeyboard" parent="EekKeyboard" type-name="EekClutterKeyboard" get-type="eek_clutter_keyboard_get_type">
-			<method name="get_actor" symbol="eek_clutter_keyboard_get_actor">
-				<return-type type="ClutterActor*"/>
+			<method name="set_theme" symbol="eek_clutter_keyboard_set_theme">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="keyboard" type="EekClutterKeyboard*"/>
+					<parameter name="theme" type="EekTheme*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="eek_clutter_keyboard_new">
-				<return-type type="EekKeyboard*"/>
-			</constructor>
+			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
 		</object>
-		<object name="EekClutterSection" parent="EekSection" type-name="EekClutterSection" get-type="eek_clutter_section_get_type">
-			<method name="get_actor" symbol="eek_clutter_section_get_actor">
-				<return-type type="ClutterActor*"/>
-				<parameters>
-					<parameter name="section" type="EekClutterSection*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eek_clutter_section_new">
-				<return-type type="EekSection*"/>
-				<parameters>
-					<parameter name="context" type="EekClutterDrawingContext*"/>
-				</parameters>
-			</constructor>
-		</object>
-		<constant name="EEK_CLUTTER_DRAWING_CONTEXT_H" type="int" value="1"/>
 		<constant name="EEK_CLUTTER_KEYBOARD_H" type="int" value="1"/>
-		<constant name="EEK_CLUTTER_KEY_H" type="int" value="1"/>
-		<constant name="EEK_CLUTTER_SECTION_H" type="int" value="1"/>
 	</namespace>
 </api>
diff --git a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
index 3f70cbcd..cf47b04b 100644
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
@@ -1,3 +1,2 @@
-include/eek-0.1/eek/eek-gtk-keyboard.h
-include/eek-0.1/eek/eek-gtk.h
+include/eek-0.90/eek/eek-gtk-keyboard.h
 lib/libeek-gtk.so
diff --git a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
index e44ef4b7..baac52c4 100644
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
@@ -1,18 +1,26 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="EekGtk">
-		<object name="EekGtkKeyboard" parent="EekKeyboard" type-name="EekGtkKeyboard" get-type="eek_gtk_keyboard_get_type">
-			<method name="get_widget" symbol="eek_gtk_keyboard_get_widget">
+		<object name="EekGtkKeyboard" parent="GtkDrawingArea" type-name="EekGtkKeyboard" get-type="eek_gtk_keyboard_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+			</implements>
+			<constructor name="new" symbol="eek_gtk_keyboard_new">
 				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</constructor>
+			<method name="set_theme" symbol="eek_gtk_keyboard_set_theme">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="keyboard" type="EekGtkKeyboard*"/>
+					<parameter name="theme" type="EekTheme*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="eek_gtk_keyboard_new">
-				<return-type type="EekKeyboard*"/>
-			</constructor>
+			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
 		</object>
-		<constant name="EEK_GTK_H" type="int" value="1"/>
 		<constant name="EEK_GTK_KEYBOARD_H" type="int" value="1"/>
 	</namespace>
 </api>
diff --git a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
index 3832123e..1eba01fd 100644
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
@@ -1,2 +1,2 @@
-include/eek-0.1/eek/eek-xkb-layout.h
+include/eek-0.90/eek/eek-xkb-layout.h
 lib/libeek-xkb.so
diff --git a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
index ed7ada20..8ab6b153 100644
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="EekXkb">
-		<object name="EekXkbLayout" parent="GInitiallyUnowned" type-name="EekXkbLayout" get-type="eek_xkb_layout_get_type">
-			<implements>
-				<interface name="EekLayout"/>
-			</implements>
+		<object name="EekXkbLayout" parent="EekLayout" type-name="EekXkbLayout" get-type="eek_xkb_layout_get_type">
 			<method name="get_geometry" symbol="eek_xkb_layout_get_geometry">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -49,6 +46,19 @@
 				</parameters>
 			</method>
 -->
+			<method name="set_names_full" symbol="eek_xkb_layout_set_names_full">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layout" type="EekXkbLayout*"/>
+				</parameters>
+			</method>
+			<method name="set_names_full_valist" symbol="eek_xkb_layout_set_names_full_valist">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layout" type="EekXkbLayout*"/>
+					<parameter name="var_args" type="va_list"/>
+				</parameters>
+			</method>
 			<method name="set_symbols" symbol="eek_xkb_layout_set_symbols">
 				<return-type type="gboolean"/>
 				<parameters>
diff --git a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
index c80510df..9de258ab 100644
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
@@ -1,3 +1,2 @@
-include/eek-0.1/eek/eek-xkl-layout.h
+include/eek-0.90/eek/eek-xkl-layout.h
 lib/libeek-xkl.so
-
diff --git a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
index 6a718917..2f793222 100644
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
@@ -2,9 +2,6 @@
 <api version="1.0">
 	<namespace name="EekXkl">
 		<object name="EekXklLayout" parent="EekXkbLayout" type-name="EekXklLayout" get-type="eek_xkl_layout_get_type">
-			<implements>
-				<interface name="EekLayout"/>
-			</implements>
 			<method name="disable_option" symbol="eek_xkl_layout_disable_option">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -53,6 +50,25 @@
 			<constructor name="new" symbol="eek_xkl_layout_new">
 				<return-type type="EekLayout*"/>
 			</constructor>
+<!--
+			<method name="set_config" symbol="eek_xkl_layout_set_config">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layout" type="EekXklLayout*"/>
+					<parameter name="config" type="XklConfigRec*"/>
+				</parameters>
+			</method>
+-->
+			<method name="set_config_full" symbol="eek_xkl_layout_set_config_full">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layout" type="EekXklLayout*"/>
+					<parameter name="model" type="gchar*"/>
+					<parameter name="layouts" type="gchar**"/>
+					<parameter name="variants" type="gchar**"/>
+					<parameter name="options" type="gchar**"/>
+				</parameters>
+			</method>
 			<method name="set_layouts" symbol="eek_xkl_layout_set_layouts">
 				<return-type type="gboolean"/>
 				<parameters>