WIP: SqueekInputMethod implementing zwp_input_method_v2

2019-07-06 02:53:40 +02:00
65 changed files with 4998 additions and 1308 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -4,6 +4,10 @@ stages:
  - build

 before_script:
+  - apt-get -y update
+  - apt-get -y install wget gnupg2
+  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
  - apt-get -y update
  - apt-get -y build-dep .

--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@ -1,20 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="sm.puri.OSK0">
-    <method name="SetVisible">
-      <arg name="visible" type="b" direction="in"/>
-      <doc:doc><doc:description>
-        Switch keyboard visibility
-      </doc:description></doc:doc>
-    </method>
-    <method name="GetVisible">
-      <arg name="visible" type="b" direction="out"/>
-      <doc:doc><doc:description>
-        Get keyboard visibility
-      </doc:description></doc:doc>
-    </method>
-    <property name="Visible" type="b" access="read">
-    </property>
-  </interface>
-</node>
--- a/data/icons/key-enter.svg
+++ b/data/icons/key-enter.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
-     version="1.1" viewBox="0 0 24 24">
-   
-    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
-             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
-             C 19,13 20,12 20,10 L 20,1 Z"
-          stroke="none" fill="black" />
-</svg>
--- a/data/icons/key-shift.svg
+++ b/data/icons/key-shift.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
-     version="1.1" viewBox="0 0 24 24">
-   
-    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
-          stroke="none" fill="black" />
-</svg>
--- a/data/icons/keyboard-mode-symbolic.svg
+++ b/data/icons/keyboard-mode-symbolic.svg
@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4043"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333093"
-   height="4.2333093mm"
-   width="4.2333331mm">
-  <defs
-     id="defs4037" />
-  <metadata
-     id="metadata4040">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-86.329776,-68.097636)"
-     id="layer1">
-    <g
-       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
-       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
-       id="g842">
-      <g
-         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
-         id="g836">
-        <path
-           id="path5166"
-           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
-         id="circle5168" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
-         id="path5170" />
-    </g>
-  </g>
-</svg>
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@ -1,53 +1,123 @@
 <?xml version="1.0"?>
 <geometry version="0.90">
-  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
+  <bounds x="0.000000" y="0.000000" width="426.0000" height="296.5853"/>
  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key name="AD01" oref="outline2" />
-      <key name="AD02" oref="outline2" />
-      <key name="AD03" oref="outline2" />
-      <key name="AD04" oref="outline2" />
-      <key name="AD05" oref="outline2" />
-      <key name="AD06" oref="outline2" />
-      <key name="AD07" oref="outline2" />
-      <key name="AD08" oref="outline2" />
-      <key name="AD09" oref="outline2" />
-      <key name="AD10" oref="outline2" />
+      <key keycode="24" name="AD01" oref="outline2">
+	<bounds x="65.56097" y="42.14634" width="37.46341" height="52.44877"/>
+      </key>
+      <key keycode="25" name="AD02" oref="outline2">
+	<bounds x="106.1463" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="26" name="AD03" oref="outline2">
+	<bounds x="145.1707" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="27" name="AD04" oref="outline2">
+	<bounds x="185.7560" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="28" name="AD05" oref="outline2">
+	<bounds x="226.3414" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="29" name="AD06" oref="outline2">
+	<bounds x="266.9268" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="30" name="AD07" oref="outline2">
+	<bounds x="307.5121" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="31" name="AD08" oref="outline2">
+	<bounds x="348.0975" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="32" name="AD09" oref="outline2">
+	<bounds x="388.6829" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="33" name="AD10" oref="outline2">
+	<bounds x="429.2682" y="42.14634" width="37.46341" height="37.46341"/>
+      </key>
    </row>
  </section>
  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key name="AC01" oref="outline2" />
-      <key name="AC02" oref="outline2" />
-      <key name="AC03" oref="outline2" />
-      <key name="AC04" oref="outline2" />
-      <key name="AC05" oref="outline2" />
-      <key name="AC06" oref="outline2" />
-      <key name="AC07" oref="outline2" />
-      <key name="AC08" oref="outline2" />
-      <key name="AC09" oref="outline2" />
+      <key keycode="38" name="AC01" oref="outline2">
+	<bounds x="76.48780" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="39" name="AC02" oref="outline2">
+	<bounds x="115.5121" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="40" name="AC03" oref="outline2">
+	<bounds x="156.0975" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="41" name="AC04" oref="outline2">
+	<bounds x="196.6829" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="42" name="AC05" oref="outline2">
+	<bounds x="237.2682" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="43" name="AC06" oref="outline2">
+	<bounds x="277.8536" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="44" name="AC07" oref="outline2">
+	<bounds x="318.4390" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="45" name="AC08" oref="outline2">
+	<bounds x="359.0243" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="46" name="AC09" oref="outline2">
+	<bounds x="399.6097" y="82.73170" width="37.46341" height="37.46341"/>
+      </key>
    </row>
  </section>
  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key name="LFSH" oref="altline" />
-      <key name="AB01" oref="outline2" />
-      <key name="AB02" oref="outline2" />
-      <key name="AB03" oref="outline2" />
-      <key name="AB04" oref="outline2" />
-      <key name="AB05" oref="outline2" />
-      <key name="AB06" oref="outline2" />
-      <key name="AB07" oref="outline2" />
-      <key name="BKSP" oref="altline" />
+      <key keycode="50" name="LFSH" oref="altline">
+	<bounds x="3.121951" y="121.7560" width="88.97561" height="37.46341"/>
+      </key>
+      <key keycode="52" name="AB01" oref="outline2">
+	<bounds x="95.21951" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="53" name="AB02" oref="outline2">
+	<bounds x="135.8048" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="54" name="AB03" oref="outline2">
+	<bounds x="176.3902" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="55" name="AB04" oref="outline2">
+	<bounds x="215.4146" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="56" name="AB05" oref="outline2">
+	<bounds x="256.0000" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="57" name="AB06" oref="outline2">
+	<bounds x="296.5853" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="58" name="AB07" oref="outline2">
+	<bounds x="337.1707" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="22" name="BKSP" oref="altline">
+	<bounds x="529.1707" y="1.560976" width="79.60975" height="37.46341"/>
+      </key>
    </row>
  </section>
  <section angle="0">
+    <bounds x="0" y="0" width="608.7804" height="201.3658"/>
    <row orientation="1">
-      <key name="ABC123" oref="altline" />
-      <key name="I150" oref="altline" />
-      <key name="SPCE" oref="spaceline" />
-      <key name="AB08" oref="outline2" />
-      <key name="RTRN" oref="outline7" />
+      <key keycode="37" name="LCTL" oref="altline">
+	<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
+      </key>
+      <key keycode="66" name="ALTGR" oref="altline">
+	<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
+      </key>
+      <key keycode="65" name="SPCE" oref="spaceline">
+	<bounds x="165.4634" y="162.3414" width="217.5853" height="37.46341"/>
+      </key>
+      <key keycode="60" name="AB09" oref="outline2">
+       <bounds x="418.3414" y="121.7560" width="37.46341" height="37.46341"/>
+      </key>
+      <key keycode="36" name="RTRN" oref="outline7">
+	<bounds x="519.8048" y="82.73170" width="88.97561" height="37.46341"/>
+      </key>
    </row>
  </section>
  <outline id="outline2" corner-radius="1.000000">
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@ -1,180 +1,304 @@
 <?xml version="1.0"?>
 <symbols version="0.90">
-  <key name="AD01">
+  <key keycode="9" name="ESC">
+    <keysym keyval="65307">Escape</keysym>
+  </key>
+  <key keycode="67" name="FK01">
+    <keysym keyval="65470">F1</keysym>
+  </key>
+  <key keycode="68" name="FK02">
+    <keysym keyval="65471">F2</keysym>
+  </key>
+  <key keycode="69" name="FK03">
+    <keysym keyval="65472">F3</keysym>
+  </key>
+  <key keycode="70" name="FK04">
+    <keysym keyval="65473">F4</keysym>
+  </key>
+  <key keycode="71" name="FK05">
+    <keysym keyval="65474">F5</keysym>
+  </key>
+  <key keycode="72" name="FK06">
+    <keysym keyval="65475">F6</keysym>
+  </key>
+  <key keycode="73" name="FK07">
+    <keysym keyval="65476">F7</keysym>
+  </key>
+  <key keycode="74" name="FK08">
+    <keysym keyval="65477">F8</keysym>
+  </key>
+  <key keycode="75" name="FK09">
+    <keysym keyval="65478">F9</keysym>
+  </key>
+  <key keycode="76" name="FK10">
+    <keysym keyval="65479">F10</keysym>
+  </key>
+  <key keycode="95" name="FK11">
+    <keysym keyval="65480">F11</keysym>
+  </key>
+  <key keycode="96" name="FK12">
+    <keysym keyval="65481">F12</keysym>
+  </key>
+  <key keycode="49" name="TLDE">
+    <keysym keyval="96">quoteleft</keysym>
+    <keysym keyval="126">asciitilde</keysym>
+  </key>
+  <key keycode="10" name="AE01">
+    <keysym keyval="49">1</keysym>
+    <keysym keyval="33">exclam</keysym>
+  </key>
+  <key keycode="11" name="AE02">
+    <keysym keyval="50">2</keysym>
+    <keysym keyval="64">at</keysym>
+  </key>
+  <key keycode="12" name="AE03">
+    <keysym keyval="51">3</keysym>
+    <keysym keyval="35">numbersign</keysym>
+  </key>
+  <key keycode="13" name="AE04">
+    <keysym keyval="52">4</keysym>
+    <keysym keyval="36">dollar</keysym>
+  </key>
+  <key keycode="14" name="AE05">
+    <keysym keyval="53">5</keysym>
+    <keysym keyval="37">percent</keysym>
+    <keysym keyval="8364">EuroSign</keysym>
+  </key>
+  <key keycode="15" name="AE06">
+    <keysym keyval="54">6</keysym>
+    <keysym keyval="94">asciicircum</keysym>
+  </key>
+  <key keycode="16" name="AE07">
+    <keysym keyval="55">7</keysym>
+    <keysym keyval="38">ampersand</keysym>
+  </key>
+  <key keycode="17" name="AE08">
+    <keysym keyval="56">8</keysym>
+    <keysym keyval="42">asterisk</keysym>
+  </key>
+  <key keycode="18" name="AE09">
+    <keysym keyval="57">9</keysym>
+    <keysym keyval="40">parenleft</keysym>
+  </key>
+  <key keycode="19" name="AE10">
+    <keysym keyval="48">0</keysym>
+    <keysym keyval="41">parenright</keysym>
+  </key>
+  <key keycode="20" name="AE11">
+    <keysym keyval="45">minus</keysym>
+    <keysym keyval="95">underscore</keysym>
+  </key>
+  <key keycode="21" name="AE12">
+    <keysym keyval="61">equal</keysym>
+    <keysym keyval="43">plus</keysym>
+  </key>
+  <key keycode="22" name="BKSP">
+    <keysym keyval="65288">BackSpace</keysym>
+  </key>
+  <key keycode="23" name="TAB">
+    <keysym keyval="65289">Tab</keysym>
+    <keysym keyval="65056">ISO_Left_Tab</keysym>
+  </key>
+  <key keycode="24" name="AD01">
    <keysym keyval="113">q</keysym>
    <keysym keyval="81">Q</keysym>
    <keysym keyval="49">1</keysym>
-    <keysym keyval="126">asciitilde</keysym>
  </key>
-  <key name="AD02">
+  <key keycode="25" name="AD02">
    <keysym keyval="119">w</keysym>
    <keysym keyval="87">W</keysym>
    <keysym keyval="50">2</keysym>
-    <keysym keyval="96">quoteleft</keysym>
  </key>
-  <key name="AD03">
+  <key keycode="26" name="AD03">
    <keysym keyval="101">e</keysym>
    <keysym keyval="69">E</keysym>
    <keysym keyval="51">3</keysym>
-    <keysym keyval="124">bar</keysym>
  </key>
-  <key name="AD04">
+  <key keycode="27" name="AD04">
    <keysym keyval="114">r</keysym>
    <keysym keyval="82">R</keysym>
    <keysym keyval="52">4</keysym>
-    <keysym keyval="183">middledot</keysym>
  </key>
-  <key name="AD05">
+  <key keycode="28" name="AD05">
    <keysym keyval="116">t</keysym>
    <keysym keyval="84">T</keysym>
    <keysym keyval="53">5</keysym>
  </key>
-  <key name="AD06">
+  <key keycode="29" name="AD06">
    <keysym keyval="121">y</keysym>
    <keysym keyval="89">Y</keysym>
    <keysym keyval="54">6</keysym>
  </key>
-  <key name="AD07">
+  <key keycode="30" name="AD07">
    <keysym keyval="117">u</keysym>
    <keysym keyval="85">U</keysym>
    <keysym keyval="55">7</keysym>
  </key>
-  <key name="AD08">
+  <key keycode="31" name="AD08">
    <keysym keyval="105">i</keysym>
    <keysym keyval="73">I</keysym>
    <keysym keyval="56">8</keysym>
  </key>
-  <key name="AD09">
+  <key keycode="32" name="AD09">
    <keysym keyval="111">o</keysym>
    <keysym keyval="79">O</keysym>
    <keysym keyval="57">9</keysym>
  </key>
-  <key name="AD10">
+  <key keycode="33" name="AD10">
    <keysym keyval="112">p</keysym>
    <keysym keyval="80">P</keysym>
    <keysym keyval="48">0</keysym>
  </key>
-  <key name="AC01">
+  <key keycode="34" name="AD11">
+    <keysym keyval="91">bracketleft</keysym>
+    <keysym keyval="123">braceleft</keysym>
+  </key>
+  <key keycode="35" name="AD12">
+    <keysym keyval="93">bracketright</keysym>
+    <keysym keyval="125">braceright</keysym>
+  </key>
+  <key keycode="51" name="BKSL">
+    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="124">bar</keysym>
+  </key>
+  <key keycode="66" name="ALTGR">
+    <keysym keyval="65027">ISO_Level3_Shift</keysym>
+  </key>
+  <key keycode="38" name="AC01">
    <keysym keyval="97">a</keysym>
    <keysym keyval="65">A</keysym>
    <keysym keyval="64">at</keysym>
-    <keysym keyval="169">copyright</keysym>
  </key>
-  <key name="AC02">
+  <key keycode="39" name="AC02">
    <keysym keyval="115">s</keysym>
    <keysym keyval="83">S</keysym>
    <keysym keyval="35">numbersign</keysym>
-    <keysym keyval="174">registeredtrademark</keysym>
  </key>
-  <key name="AC03">
+  <key keycode="40" name="AC03">
    <keysym keyval="100">d</keysym>
    <keysym keyval="68">D</keysym>
    <keysym keyval="36">dollar</keysym>
-    <keysym keyval="163">poundsign</keysym>
  </key>
-  <key name="AC04">
+  <key keycode="41" name="AC04">
    <keysym keyval="102">f</keysym>
    <keysym keyval="70">F</keysym>
    <keysym keyval="37">percent</keysym>
-    <text>€</text>
  </key>
-  <key name="AC05">
+  <key keycode="42" name="AC05">
    <keysym keyval="103">g</keysym>
    <keysym keyval="71">G</keysym>
    <keysym keyval="38">ampersand</keysym>
-    <keysym keyval="165">yensign</keysym>
  </key>
-  <key name="AC06">
+  <key keycode="43" name="AC06">
    <keysym keyval="104">h</keysym>
    <keysym keyval="72">H</keysym>
    <keysym keyval="45">minus</keysym>
-    <keysym keyval="94">asciicircum</keysym>
  </key>
-  <key name="AC07">
+  <key keycode="44" name="AC07">
    <keysym keyval="106">j</keysym>
    <keysym keyval="74">J</keysym>
-    <keysym keyval="43">plus</keysym>
-    <keysym keyval="176">degreesign</keysym>
+    <keysym keyval="95">underscore</keysym>
  </key>
-  <key name="AC08">
+  <key keycode="45" name="AC08">
    <keysym keyval="107">k</keysym>
    <keysym keyval="75">K</keysym>
-    <keysym keyval="40">parenleft</keysym>
    <keysym keyval="123">braceleft</keysym>
  </key>
-  <key name="AC09">
+  <key keycode="46" name="AC09">
    <keysym keyval="108">l</keysym>
    <keysym keyval="76">L</keysym>
-    <keysym keyval="41">parenright</keysym>
    <keysym keyval="125">braceright</keysym>
  </key>
-  <key name="RTRN">
-    <keysym keyval="65293" icon="key-enter">Return</keysym>
+  <key keycode="47" name="AC10">
+    <keysym keyval="59">semicolon</keysym>
+    <keysym keyval="58">colon</keysym>
  </key>
-  <key name="LFSH">
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" label="=/+">Shift_L</keysym>
-    <keysym keyval="65505" label="123">Shift_L</keysym>
+  <key keycode="48" name="AC11">
+    <keysym keyval="39">quoteright</keysym>
+    <keysym keyval="34">quotedbl</keysym>
  </key>
-  <key name="AB01">
+  <key keycode="36" name="RTRN">
+    <keysym keyval="65293">Return</keysym>
+  </key>
+  <key keycode="50" name="LFSH">
+    <keysym keyval="65505">Shift_L</keysym>
+  </key>
+  <key keycode="52" name="AB01">
    <keysym keyval="122">z</keysym>
    <keysym keyval="90">Z</keysym>
-    <keysym keyval="44">comma</keysym>
-    <keysym keyval="92">backslash</keysym>
+    <keysym keyval="43">plus</keysym>
  </key>
-  <key name="AB02">
+  <key keycode="53" name="AB02">
    <keysym keyval="120">x</keysym>
    <keysym keyval="88">X</keysym>
    <keysym keyval="34">quotedbl</keysym>
-    <keysym keyval="47">slash</keysym>
  </key>
-  <key name="AB03">
+  <key keycode="54" name="AB03">
    <keysym keyval="99">c</keysym>
    <keysym keyval="67">C</keysym>
    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="60">less</keysym>
  </key>
-  <key name="AB04">
+  <key keycode="55" name="AB04">
    <keysym keyval="118">v</keysym>
    <keysym keyval="86">V</keysym>
    <keysym keyval="58">colon</keysym>
-    <keysym keyval="62">greater</keysym>
  </key>
-  <key name="AB05">
+  <key keycode="56" name="AB05">
    <keysym keyval="98">b</keysym>
    <keysym keyval="66">B</keysym>
    <keysym keyval="59">semicolon</keysym>
-    <keysym keyval="61">equal</keysym>
  </key>
-  <key name="AB06">
+  <key keycode="57" name="AB06">
    <keysym keyval="110">n</keysym>
    <keysym keyval="78">N</keysym>
    <keysym keyval="33">exclam</keysym>
-    <keysym keyval="91">bracketleft</keysym>
  </key>
-  <key name="AB07">
+  <key keycode="58" name="AB07">
    <keysym keyval="109">m</keysym>
    <keysym keyval="77">M</keysym>
    <keysym keyval="63">question</keysym>
-    <keysym keyval="93">bracketright</keysym>
  </key>
-  <key name="AB08">
+  <key keycode="59" name="AB08">
+    <keysym keyval="44">comma</keysym>
+    <keysym keyval="60">less</keysym>
+  </key>
+  <key keycode="60" name="AB09">
    <keysym keyval="46">period</keysym>
+    <keysym keyval="62">greater</keysym>
  </key>
-  <key name="ABC123">
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="ABC">show-letters</symbol>
-    <symbol label="ABC">show-letters</symbol>
+  <key keycode="61" name="AB10">
+    <keysym keyval="47">slash</keysym>
+    <keysym keyval="63">question</keysym>
  </key>
-  <key name="I150">
-    <symbol label="☺" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
+  <key keycode="62" name="RTSH">
+    <keysym keyval="65506">Shift_R</keysym>
  </key>
-  <key name="SPCE">
+  <key keycode="149" name="I149">
+    <symbol label="⌨" icon="input-keyboard-symbolic" tooltip="Change keyboard">cycle-keyboard</symbol>
+  </key>
+  <key keycode="150" name="I150">
+    <symbol label="☺" icon="preferences-system-symbolic" tooltip="Setup">preferences</symbol>
+  </key>
+  <key keycode="37" name="LCTL">
+    <keysym keyval="65507">Control_L</keysym>
+  </key>
+  <key keycode="64" name="LALT">
+    <keysym keyval="65513">Alt_L</keysym>
+    <keysym keyval="65511">Meta_L</keysym>
+  </key>
+  <key keycode="65" name="SPCE">
    <keysym keyval="32">space</keysym>
  </key>
-  <key name="BKSP">
-    <keysym keyval="65288" icon="edit-clear-symbolic">backspace</keysym>
+  <key keycode="113" name="LEFT">
+    <keysym keyval="65361">Left</keysym>
+  </key>
+  <key keycode="111" name="UP">
+    <keysym keyval="65362">Up</keysym>
+  </key>
+  <key keycode="116" name="DOWN">
+    <keysym keyval="65364">Down</keysym>
+  </key>
+  <key keycode="114" name="RGHT">
+    <keysym keyval="65363">Right</keysym>
  </key>
 </symbols>
--- a/data/meson.build
+++ b/data/meson.build
@ -1,12 +1,57 @@
-gnome = import('gnome')

-squeekboard_resources = gnome.compile_resources(
-   'squeekboard-resources',
-   'squeekboard.gresources.xml',
-
-   c_name: 'squeekboard',
+install_data(
+    'themes/default.css',
+    install_dir: pkgdatadir + '/themes',
 )

+install_data(
+    'keyboards/keyboards.xml',
+    install_dir: pkgdatadir + '/keyboards/',
+)
+
+install_data(
+    'keyboards/geometry/compact.xml',
+    install_dir: pkgdatadir + '/keyboards/geometry/',
+)
+
+symbols = [
+    'ar.xml',
+    'as-inscript.xml',
+    'be.xml',
+    'bn-inscript.xml',
+    'fa.xml',
+    'gu-inscript.xml',
+    'he.xml',
+    'hi-inscript.xml',
+    'ja-kana.xml',
+    'kk.xml',
+    'kn-inscript.xml',
+    'ks-inscript.xml',
+    'ks.xml',
+    'mai-inscript.xml',
+    'ml-inscript.xml',
+    'mr-inscript.xml',
+    'my.xml',
+    'or-inscript.xml',
+    'pa-inscript.xml',
+    'ru.xml',
+    'sd-inscript.xml',
+    'ta-inscript.xml',
+    'te-inscript.xml',
+    'th.xml',
+    'ua.xml',
+    'ug.xml',
+    'us.xml',
+    'zh-bopomofo.xml',
+]
+
+foreach symbol: symbols
+    install_data(
+        'keyboards/symbols/' + symbol,
+        install_dir: pkgdatadir + '/keyboards/symbols/',
+    )
+endforeach
+
 desktop_file = 'sm.puri.Squeekboard.desktop'

 i18n.merge_file('desktop',
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/sm/puri/squeekboard">
-   <file compressed="true">style.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/bn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/fa.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/gu-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/he.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/hi-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ja-kana.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kk.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mai-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ml-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mr-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/my.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/or-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/pa-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ru.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/sd-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ta-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/te-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/th.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
-   <file>icons/key-enter.svg</file>
-   <file>icons/key-shift.svg</file>
-   <file>icons/keyboard-mode-symbolic.svg</file>
-  </gresource>
-</gresources>
--- a/data/themes/default.css
+++ b/data/themes/default.css
--- a/debian/control
+++ b/debian/control
@ -11,6 +11,7 @@ Build-Depends:
 libcroco3-dev,
 libwayland-dev (>= 1.16),
 rustc,
+ virtboard,
 wayland-protocols (>= 1.14)
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
--- a/debian/copyright
+++ b/debian/copyright
@ -3,58 +3,7 @@ Upstream-Name: evscript
 Source: https://source.puri.sm/david.boddie/evscript

 Files: *
-Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
-           2010-2011 Red Hat, Inc.
-           2019 Purism SPC
-License: GPL-3+
-
-Files: eek/layersurface.c
-       src/wayland.c
-       src/key-emitter.c
-       meson.build
-       src/meson.build
-       po/meson.build
-Copyright: 2018-2019 Purism SPC
-License: GPL-3+
-
-Files: eekboard/keymap.c
-Copyright: 2000 Red Hat, Inc.
-           2019 Purism, SPC
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-Files: protocols/wlr-layer-shell-unstable-v1.xml
-Copytight: Copyright © 2017 Drew DeVault
-License: X11
- Permission to use, copy, modify, distribute, and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and fthat both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of the copyright holders not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  The copyright holders make
- no representations about the suitability of this software for any
- purpose.  It is provided "as is" without express or implied warranty.
- .
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+Copyright: 2019 Purism SPC
 License: GPL-3+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/eek/eek-container.c
+++ b/eek/eek-container.c
@ -40,19 +40,23 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-typedef struct _EekContainerPrivate
+G_DEFINE_ABSTRACT_TYPE (EekContainer, eek_container, EEK_TYPE_ELEMENT);
+
+#define EEK_CONTAINER_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CONTAINER, EekContainerPrivate))
+
+
+struct _EekContainerPrivate
 {
    GList *head;
    GList *last;
-} EekContainerPrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekContainer, eek_container, EEK_TYPE_ELEMENT)
+};

 static void
 eek_container_real_add_child (EekContainer *self,
                              EekElement   *child)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);

    g_return_if_fail (EEK_IS_ELEMENT(child));
    g_object_ref (child);
@ -71,7 +75,7 @@ static void
 eek_container_real_remove_child (EekContainer *self,
                                 EekElement   *child)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
    GList *head;

    g_return_if_fail (EEK_IS_ELEMENT(child));
@ -90,7 +94,7 @@ eek_container_real_foreach_child (EekContainer *self,
                                  EekCallback   callback,
                                  gpointer      user_data)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
    GList *head;

    for (head = priv->head; head; head = g_list_next (head))
@ -102,7 +106,7 @@ eek_container_real_find (EekContainer *self,
                         EekCompareFunc func,
                         gpointer user_data)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
    GList *head;

    head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
@ -114,8 +118,7 @@ eek_container_real_find (EekContainer *self,
 static void
 eek_container_dispose (GObject *object)
 {
-    EekContainer        *self = EEK_CONTAINER (object);
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
    GList *head;

    for (head = priv->head; head; head = priv->head) {
@ -131,6 +134,9 @@ eek_container_class_init (EekContainerClass *klass)
 {
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekContainerPrivate));
+
    klass->add_child = eek_container_real_add_child;
    klass->remove_child = eek_container_real_remove_child;
    klass->foreach_child = eek_container_real_foreach_child;
@ -183,7 +189,7 @@ eek_container_class_init (EekContainerClass *klass)
 static void
 eek_container_init (EekContainer *self)
 {
-    /* void */
+    self->priv = EEK_CONTAINER_GET_PRIVATE(self);
 }

 /**
--- a/eek/eek-container.h
+++ b/eek/eek-container.h
@ -30,7 +30,14 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_CONTAINER (eek_container_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElement)
+#define EEK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CONTAINER, EekContainer))
+#define EEK_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CONTAINER, EekContainerClass))
+#define EEK_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CONTAINER))
+#define EEK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CONTAINER))
+#define EEK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CONTAINER, EekContainerClass))
+
+typedef struct _EekContainerClass EekContainerClass;
+typedef struct _EekContainerPrivate EekContainerPrivate;

 /**
 * EekCallback:
@ -43,6 +50,14 @@ G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElemen
 typedef void (*EekCallback) (EekElement *element, gpointer user_data);
 typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);

+struct _EekContainer
+{
+    /*< private >*/
+    EekElement parent;
+
+    EekContainerPrivate *priv;
+};
+
 /**
 * EekContainerClass:
 * @foreach_child: virtual function for iterating over the container's children
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -52,16 +52,20 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-typedef struct _EekElementPrivate
+G_DEFINE_ABSTRACT_TYPE (EekElement, eek_element, G_TYPE_OBJECT);
+
+#define EEK_ELEMENT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_ELEMENT, EekElementPrivate))
+
+
+struct _EekElementPrivate
 {
    gchar *name;
    EekBounds bounds;
    EekElement *parent;
    gint group;
    gint level;
-} EekElementPrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)
+};

 static void
 eek_element_real_symbol_index_changed (EekElement *self,
@ -74,8 +78,7 @@ eek_element_real_symbol_index_changed (EekElement *self,
 static void
 eek_element_finalize (GObject *object)
 {
-    EekElement        *self = EEK_ELEMENT (object);
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
+    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(object);

    g_free (priv->name);
    G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
@ -143,6 +146,9 @@ eek_element_class_init (EekElementClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekElementPrivate));
+
    /* signals */
    klass->symbol_index_changed = eek_element_real_symbol_index_changed;

@ -232,8 +238,9 @@ eek_element_class_init (EekElementClass *klass)
 static void
 eek_element_init (EekElement *self)
 {
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
+    EekElementPrivate *priv;

+    priv = self->priv = EEK_ELEMENT_GET_PRIVATE(self);
    priv->group = -1;
    priv->level = -1;
 }
@ -252,12 +259,10 @@ eek_element_set_parent (EekElement *element,
    g_return_if_fail (EEK_IS_ELEMENT(element));
    g_return_if_fail (parent == NULL || EEK_IS_ELEMENT(parent));

-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->parent == parent)
+    if (element->priv->parent == parent)
        return;

-    if (priv->parent != NULL) {
+    if (element->priv->parent != NULL) {
        /* release self-reference acquired when setting parent */
        g_object_unref (element);
    }
@ -266,7 +271,7 @@ eek_element_set_parent (EekElement *element,
        g_object_ref (element);
    }

-    priv->parent = parent;
+    element->priv->parent = parent;
 }

 /**
@ -280,10 +285,7 @@ EekElement *
 eek_element_get_parent (EekElement *element)
 {
    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->parent;
+    return element->priv->parent;
 }

 /**
@ -298,11 +300,8 @@ eek_element_set_name (EekElement  *element,
                      const gchar *name)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    g_free (priv->name);
-    priv->name = g_strdup (name);
+    g_free (element->priv->name);
+    element->priv->name = g_strdup (name);
 }

 /**
@ -316,10 +315,7 @@ const gchar *
 eek_element_get_name (EekElement  *element)
 {
    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->name;
+    return element->priv->name;
 }

 /**
@ -336,10 +332,7 @@ eek_element_set_bounds (EekElement  *element,
                        EekBounds   *bounds)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
+    memcpy (&element->priv->bounds, bounds, sizeof(EekBounds));
 }

 /**
@ -357,10 +350,7 @@ eek_element_get_bounds (EekElement  *element,
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
    g_return_if_fail (bounds != NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
+    memcpy (bounds, &element->priv->bounds, sizeof(EekBounds));
 }

 /**
@ -496,14 +486,11 @@ eek_element_set_group (EekElement *element,
                       gint        group)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->group != group) {
-        priv->group = group;
+    if (element->priv->group != group) {
+        element->priv->group = group;
        g_object_notify (G_OBJECT(element), "group");
        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       group, priv->level);
+                       group, element->priv->level);
    }
 }

@ -522,14 +509,11 @@ eek_element_set_level (EekElement *element,
                       gint        level)
 {
    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->level != level) {
-        priv->level = level;
+    if (element->priv->level != level) {
+        element->priv->level = level;
        g_object_notify (G_OBJECT(element), "level");
        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       priv->group, level);
+                       element->priv->group, level);
    }
 }

@ -546,10 +530,7 @@ gint
 eek_element_get_group (EekElement *element)
 {
    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->group;
+    return element->priv->group;
 }

 /**
@ -565,8 +546,5 @@ gint
 eek_element_get_level (EekElement *element)
 {
    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->level;
+    return element->priv->level;
 }
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -30,7 +30,22 @@

 G_BEGIN_DECLS
 #define EEK_TYPE_ELEMENT (eek_element_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)
+#define EEK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_ELEMENT, EekElement))
+#define EEK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_ELEMENT, EekElementClass))
+#define EEK_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_ELEMENT))
+#define EEK_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_ELEMENT))
+#define EEK_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_ELEMENT, EekElementClass))
+
+typedef struct _EekElementClass   EekElementClass;
+typedef struct _EekElementPrivate EekElementPrivate;
+
+struct _EekElement
+{
+    /*< private >*/
+    GObject parent;
+
+    EekElementPrivate *priv;
+};

 struct _EekElementClass
 {
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -31,7 +31,6 @@
 #include <canberra-gtk.h>
 #endif

-#include <math.h>
 #include <string.h>

 #include "eek-gtk-keyboard.h"
@ -47,13 +46,18 @@ enum {
    PROP_LAST
 };

+G_DEFINE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA);
+
+#define EEK_GTK_KEYBOARD_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardPrivate))
+
 /* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
   GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif

-typedef struct _EekGtkKeyboardPrivate
+struct _EekGtkKeyboardPrivate
 {
    EekRenderer *renderer;
    EekKeyboard *keyboard;
@ -61,11 +65,7 @@ typedef struct _EekGtkKeyboardPrivate
    gulong key_unlocked_handler;
    gulong symbol_index_changed_handler;
    EekTheme *theme;
-
-    GdkEventSequence *sequence; // unowned reference
-} EekGtkKeyboardPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
+};

 static void       on_key_pressed          (EekKey      *key,
                                           EekGtkKeyboard *self);
@ -106,8 +106,7 @@ static gboolean
 eek_gtk_keyboard_real_draw (GtkWidget *self,
                            cairo_t   *cr)
 {
-    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
    GtkAllocation allocation;
    GList *list, *head;

@ -149,8 +148,7 @@ static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
-    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);

    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
@ -163,7 +161,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,

 static void depress(EekGtkKeyboard *self,
                    gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
    if (key) {
        eek_keyboard_press_key(priv->keyboard, key, time);
@ -173,7 +171,7 @@ static void depress(EekGtkKeyboard *self,

 static void drag(EekGtkKeyboard *self,
                 gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);

    if (key) {
@ -199,7 +197,7 @@ static void drag(EekGtkKeyboard *self,
 }

 static void release(EekGtkKeyboard *self, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);

    GList *list = eek_keyboard_get_pressed_keys (priv->keyboard);
    for (GList *head = list; head; head = g_list_next (head)) {
@ -244,23 +242,20 @@ eek_gtk_keyboard_real_motion_notify_event (GtkWidget      *self,

 // Only one touch stream at a time allowed. Others will be completely ignored.
 static gboolean
-handle_touch_event (GtkWidget     *widget,
-                    GdkEventTouch *event)
-{
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+handle_touch_event (GtkWidget      *widget,
+                    GdkEventTouch *event) {
+    EekGtkKeyboard *self = EEK_GTK_KEYBOARD(widget);
    if (event->type == GDK_TOUCH_BEGIN) {
-        if (priv->sequence) {
+        if (self->sequence) {
            // Ignore second and following touch points
            return FALSE;
        }
-        priv->sequence = event->sequence;
+        self->sequence = event->sequence;
        depress(self, event->x, event->y, event->time);
        return TRUE;
    }

-    if (priv->sequence != event->sequence) {
+    if (self->sequence != event->sequence) {
        return FALSE;
    }

@ -270,16 +265,16 @@ handle_touch_event (GtkWidget     *widget,
    if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
        // TODO: can the event have different coords than the previous update event?
        release(self, event->time);
-        priv->sequence = NULL;
+        self->sequence = NULL;
    }
    return TRUE;
 }

+
 static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
-    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);

    if (priv->keyboard) {
        GList *list, *head;
@ -306,9 +301,7 @@ eek_gtk_keyboard_real_query_tooltip (GtkWidget  *widget,
                                     gboolean    keyboard_tooltip,
                                     GtkTooltip *tooltip)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
    EekKey *key;

    key = eek_renderer_find_key_by_position (priv->renderer,
@ -329,7 +322,7 @@ static void
 eek_gtk_keyboard_set_keyboard (EekGtkKeyboard *self,
                               EekKeyboard    *keyboard)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
    priv->keyboard = g_object_ref (keyboard);

    priv->key_locked_handler =
@ -365,8 +358,7 @@ eek_gtk_keyboard_set_property (GObject      *object,
 static void
 eek_gtk_keyboard_dispose (GObject *object)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (object);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(object);

    if (priv->renderer) {
        g_object_unref (priv->renderer);
@ -415,6 +407,9 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekGtkKeyboardPrivate));
+
    widget_class->realize = eek_gtk_keyboard_real_realize;
    widget_class->unmap = eek_gtk_keyboard_real_unmap;
    widget_class->draw = eek_gtk_keyboard_real_draw;
@ -445,7 +440,7 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    /* void */
+    self->priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
 }

 /**
@ -484,154 +479,87 @@ magnify_bounds (GtkWidget *self,
    large_bounds->y = CLAMP(y, 0, allocation.height - large_bounds->height);
 }

-/*
- * Alleviate the asymmetry between drawing a pressed key and a released key,
- * and consistently draw to the exact same area.
- *
- * By saving the dirty rectangle we can limit drawing of the backbuffer to
- * the screen as well, eg gdk_window_invalidate_rect() instead of
- * gtk_widget_queue_draw() which redraws the entire widget.
- *
- * b1 is mandatory, b2 is optional
- */
-static GdkRectangle
-clip_bounds_to_dirty_rectangle (cairo_t *cr, EekBounds *b1, EekBounds *b2)
-{
-    if (b2)
-        cairo_rectangle (cr, b2->x, b2->y, b2->width, b2->height);
-
-    cairo_rectangle (cr, b1->x, b1->y, b1->width, b1->height);
-    cairo_clip (cr);
-
-    /*
-     * save the clipped region to a bounding box so we can limit
-     * the drawing of the backbuffer to the screen to the same area
-     */
-    cairo_rectangle_t bbox;
-
-    cairo_clip_extents (cr, &bbox.x, &bbox.y, &bbox.width, &bbox.height);
-
-    /* convert double to int, making sure r strictly covers bbox to avoid
-     * artefacts. floor() is unnecessary, ceil() is not */
-    GdkRectangle r = {
-        floor (bbox.x),
-        floor (bbox.y),
-        ceil  (bbox.width),
-        ceil  (bbox.height)
-    };
-
-    return r;
-}
-
 static void
 render_pressed_key (GtkWidget *widget,
                    EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
    EekBounds bounds, large_bounds;

-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
    magnify_bounds (widget, &bounds, &large_bounds, 1.5);

-    /*
-     * clip to limit drawing to backbuffer and save clip region to dirty_rect
-     * to limit redrawing of the backbuffer to the same area
-     */
-    GdkRectangle dirty_rect = clip_bounds_to_dirty_rectangle (cr, &bounds, &large_bounds);
+    GdkWindow *window = GDK_DRAWABLE (gtk_widget_get_window (widget));
+    cairo_region_t *region = gdk_window_get_clip_region (window);

+    GdkDrawingContext *context = gdk_window_begin_draw_frame(
+        window, region
+    );
+    cairo_t *cr = gdk_drawing_context_get_cairo_context(context);
    cairo_save (cr);
    cairo_translate (cr, bounds.x, bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
    cairo_restore (cr);
-/*
+
    cairo_save (cr);
    cairo_translate (cr, large_bounds.x, large_bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
    cairo_restore (cr);
-*/
-    gdk_window_end_draw_frame (window, context);

-    cairo_region_destroy (region);
-
-    /* force immediate drawing of the backbuffer to the screen */
-    gdk_window_invalidate_rect (window, &dirty_rect, FALSE);
+    gdk_window_end_draw_frame(window, context);
+    cairo_region_destroy(region);
 }

 static void
 render_locked_key (GtkWidget *widget,
                   EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
    EekBounds bounds;
+    cairo_t *cr;

-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
+    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));

    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-
-    /*
-     * clip to limit drawing to backbuffer and save clip region to dirty_rect
-     * to limit redrawing of the backbuffer to the same area
-     */
-    GdkRectangle dirty_rect = clip_bounds_to_dirty_rectangle (cr, &bounds, NULL);
-
    cairo_translate (cr, bounds.x, bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);

-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-
-    /* force immediate drawing of the backbuffer to the screen */
-    gdk_window_invalidate_rect (window, &dirty_rect, FALSE);
+    cairo_destroy (cr);
 }

 static void
 render_released_key (GtkWidget *widget,
                     EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
    EekBounds bounds, large_bounds;
+    cairo_t *cr;

-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
+    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));

    eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (widget, &bounds, &large_bounds, 1.5);
-
-    /*
-     * clip to limit drawing to backbuffer and save clip region to dirty_rect
-     * to limit redrawing of the backbuffer to the same area
-     */
-    GdkRectangle dirty_rect = clip_bounds_to_dirty_rectangle(cr, &bounds, &large_bounds);
+    magnify_bounds (widget, &bounds, &large_bounds, 2.0);
+    cairo_rectangle (cr,
+                     large_bounds.x,
+                     large_bounds.y,
+                     large_bounds.width,
+                     large_bounds.height);
+    cairo_rectangle (cr,
+                     bounds.x,
+                     bounds.y,
+                     bounds.width,
+                     bounds.height);
+    cairo_clip (cr);

    eek_renderer_render_keyboard (priv->renderer, cr);
-
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-
-    /* force immediate drawing of the backbuffer to the screen */
-    gdk_window_invalidate_rect (window, &dirty_rect, FALSE);
+    cairo_destroy (cr);
 }

 static void
 on_key_pressed (EekKey      *key,
                EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);

    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
@ -652,7 +580,7 @@ static void
 on_key_released (EekKey      *key,
                 EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);

    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
@ -675,7 +603,7 @@ on_key_locked (EekKeyboard *keyboard,
               gpointer     user_data)
 {
    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);

    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
@ -690,7 +618,7 @@ on_key_unlocked (EekKeyboard *keyboard,
                 gpointer     user_data)
 {
    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);

    /* renderer may have not been set yet if the widget is a popup */
    if (!priv->renderer)
@ -714,9 +642,11 @@ void
 eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
                            EekTheme       *theme)
 {
+    EekGtkKeyboardPrivate *priv;
+
    g_return_if_fail (EEK_IS_GTK_KEYBOARD(keyboard));
    g_return_if_fail (EEK_IS_THEME(theme));

-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (keyboard);
+    priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
    priv->theme = g_object_ref (theme);
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -32,7 +32,25 @@

 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK, GTK_KEYBOARD, GtkDrawingArea)
+#define EEK_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboard))
+#define EEK_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
+#define EEK_IS_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_KEYBOARD))
+#define EEK_IS_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_KEYBOARD))
+#define EEK_GTK_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
+
+typedef struct _EekGtkKeyboard EekGtkKeyboard;
+typedef struct _EekGtkKeyboardClass EekGtkKeyboardClass;
+typedef struct _EekGtkKeyboardPrivate EekGtkKeyboardPrivate;
+
+struct _EekGtkKeyboard
+{
+    /*< private >*/
+    GtkDrawingArea parent;
+
+    GdkEventSequence *sequence; // unowned reference
+
+    EekGtkKeyboardPrivate *priv;
+};

 struct _EekGtkKeyboardClass
 {
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@ -57,23 +57,10 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
                                        gint size)
 {
    GdkPixbuf *pixbuf;
-    GError *error = NULL;
+    GError *error;
    cairo_surface_t *surface;

-    gchar *path = g_strconcat("/sm/puri/squeekboard/icons/", icon_name, ".svg", NULL);
-
-    pixbuf = gdk_pixbuf_new_from_resource_at_scale (path, size, size,
-                                                    TRUE, &error);
-
-    if (pixbuf != NULL)
-        goto found;
-    else {
-/*      g_warning ("can't get icon pixbuf for %s: %s", path, error->message);*/
-        g_error_free (error);
-        error = NULL;
-    }
-    g_free(path);
-
+    error = NULL;
    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                       icon_name,
                                       size,
@ -87,7 +74,6 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
        return NULL;
    }

-found:
    surface = pixbuf_to_cairo_surface (pixbuf);
    g_object_unref (pixbuf);
    return surface;
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@ -54,7 +54,13 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-typedef struct _EekKeyPrivate
+G_DEFINE_TYPE (EekKey, eek_key, EEK_TYPE_ELEMENT);
+
+#define EEK_KEY_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEY, EekKeyPrivate))
+
+
+struct _EekKeyPrivate
 {
    guint keycode;
    EekSymbolMatrix *symbol_matrix;
@ -63,14 +69,12 @@ typedef struct _EekKeyPrivate
    gulong oref; // UI outline reference
    gboolean is_pressed;
    gboolean is_locked;
-} EekKeyPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekKey, eek_key, EEK_TYPE_ELEMENT)
+};

 static void
 eek_key_real_locked (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);

    priv->is_locked = TRUE;
 #if DEBUG
@ -81,7 +85,7 @@ eek_key_real_locked (EekKey *self)
 static void
 eek_key_real_unlocked (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);

    priv->is_locked = FALSE;
 #if DEBUG
@ -92,11 +96,8 @@ eek_key_real_unlocked (EekKey *self)
 static void
 eek_key_finalize (GObject *object)
 {
-    EekKey        *self = EEK_KEY (object);
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
-
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(object);
    eek_symbol_matrix_free (priv->symbol_matrix);
-
    G_OBJECT_CLASS (eek_key_parent_class)->finalize (object);
 }

@ -173,6 +174,9 @@ eek_key_class_init (EekKeyClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekKeyPrivate));
+
    gobject_class->set_property = eek_key_set_property;
    gobject_class->get_property = eek_key_get_property;
    gobject_class->finalize     = eek_key_finalize;
@ -281,7 +285,9 @@ eek_key_class_init (EekKeyClass *klass)
 static void
 eek_key_init (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv;
+
+    priv = self->priv = EEK_KEY_GET_PRIVATE(self);
    priv->symbol_matrix = eek_symbol_matrix_new (0, 0);
 }

@ -301,10 +307,7 @@ eek_key_set_keycode (EekKey *key,
                     guint   keycode)
 {
    g_return_if_fail (EEK_IS_KEY (key));
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    priv->keycode = keycode;
+    key->priv->keycode = keycode;
 }

 /**
@ -318,10 +321,7 @@ guint
 eek_key_get_keycode (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY (key), EEK_INVALID_KEYCODE);
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->keycode;
+    return key->priv->keycode;
 }

 /**
@ -337,10 +337,8 @@ eek_key_set_symbol_matrix (EekKey          *key,
 {
    g_return_if_fail (EEK_IS_KEY(key));

-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    eek_symbol_matrix_free (priv->symbol_matrix);
-    priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
+    eek_symbol_matrix_free (key->priv->symbol_matrix);
+    key->priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
 }

 /**
@ -354,10 +352,7 @@ EekSymbolMatrix *
 eek_key_get_symbol_matrix (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY(key), NULL);
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->symbol_matrix;
+    return key->priv->symbol_matrix;
 }

 /**
@ -445,7 +440,7 @@ eek_key_get_symbol_at_index (EekKey *key,
                             gint    fallback_group,
                             gint    fallback_level)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(key);
    gint num_symbols;

    g_return_val_if_fail (fallback_group >= 0, NULL);
@ -497,14 +492,12 @@ eek_key_set_index (EekKey *key,
    g_return_if_fail (0 <= column);
    g_return_if_fail (0 <= row);

-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    if (priv->column != column) {
-        priv->column = column;
+    if (key->priv->column != column) {
+        key->priv->column = column;
        g_object_notify (G_OBJECT(key), "column");
    }
-    if (priv->row != row) {
-        priv->row = row;
+    if (key->priv->row != row) {
+        key->priv->row = row;
        g_object_notify (G_OBJECT(key), "row");
    }
 }
@ -525,12 +518,10 @@ eek_key_get_index (EekKey *key,
    g_return_if_fail (EEK_IS_KEY(key));
    g_return_if_fail (column != NULL || row != NULL);

-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
    if (column != NULL)
-        *column = priv->column;
+        *column = key->priv->column;
    if (row != NULL)
-        *row = priv->row;
+        *row = key->priv->row;
 }

 /**
@ -545,11 +536,8 @@ eek_key_set_oref (EekKey *key,
                  guint   oref)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    if (priv->oref != oref) {
-        priv->oref = oref;
+    if (key->priv->oref != oref) {
+        key->priv->oref = oref;
        g_object_notify (G_OBJECT(key), "oref");
    }
 }
@ -565,10 +553,7 @@ guint
 eek_key_get_oref (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY (key), 0);
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->oref;
+    return key->priv->oref;
 }

 /**
@ -581,10 +566,7 @@ gboolean
 eek_key_is_pressed (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->is_pressed;
+    return key->priv->is_pressed;
 }

 /**
@ -597,17 +579,11 @@ gboolean
 eek_key_is_locked (EekKey *key)
 {
    g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->is_locked;
+    return key->priv->is_locked;
 }

 void eek_key_set_pressed(EekKey *key, gboolean value)
 {
    g_return_if_fail (EEK_IS_KEY(key));
-
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    priv->is_pressed = value;
+    key->priv->is_pressed = value;
 }
--- a/eek/eek-key.h
+++ b/eek/eek-key.h
@ -31,7 +31,31 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_KEY (eek_key_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekKey, eek_key, EEK, KEY, EekElement)
+#define EEK_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEY, EekKey))
+#define EEK_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEY, EekKeyClass))
+#define EEK_IS_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEY))
+#define EEK_IS_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEY))
+#define EEK_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEY, EekKeyClass))
+
+typedef struct _EekKeyClass EekKeyClass;
+typedef struct _EekKeyPrivate EekKeyPrivate;
+
+/**
+ * EekKey:
+ *
+ * Contains information about the state of a key.
+ * TODO: rewrite as a plain struct
+ *
+ * The #EekKey structure contains only private data and should only be
+ * accessed using the provided API.
+ */
+struct _EekKey
+{
+    /*< private >*/
+    EekElement parent;
+
+    EekKeyPrivate *priv;
+};

 /**
 * EekKeyClass:
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -53,15 +53,10 @@ enum {
    LAST_SIGNAL
 };

-enum {
-    VIEW_LETTERS_LOWER,
-    VIEW_LETTERS_UPPER,
-    VIEW_NUMBERS,
-    VIEW_SYMBOLS
-};
-
 static guint signals[LAST_SIGNAL] = { 0, };

+G_DEFINE_TYPE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
+
 #define EEK_KEYBOARD_GET_PRIVATE(obj)                                  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYBOARD, EekKeyboardPrivate))

@ -70,19 +65,16 @@ struct _EekKeyboardPrivate
    EekLayout *layout;
    EekModifierBehavior modifier_behavior;
    EekModifierType modifiers;
-    unsigned int old_level;
    GList *pressed_keys;
    GList *locked_keys;
    GArray *outline_array;
-    GHashTable *names;
+    GHashTable *keycodes;

    /* modifiers dynamically assigned at run time */
    EekModifierType num_lock_mask;
    EekModifierType alt_gr_mask;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
-
 G_DEFINE_BOXED_TYPE(EekModifierKey, eek_modifier_key,
                    eek_modifier_key_copy, eek_modifier_key_free);

@ -129,9 +121,9 @@ section_child_added_cb (EekContainer *container,
                        EekElement   *element,
                        EekKeyboard  *keyboard)
 {
-    const gchar *name = eek_element_get_name(element);
-    g_hash_table_insert (keyboard->priv->names,
-                         (gpointer)name,
+    guint keycode = eek_key_get_keycode (EEK_KEY(element));
+    g_hash_table_insert (keyboard->priv->keycodes,
+                         GUINT_TO_POINTER(keycode),
                         element);
 }

@ -140,9 +132,9 @@ section_child_removed_cb (EekContainer *container,
                          EekElement   *element,
                          EekKeyboard  *keyboard)
 {
-    const gchar *name = eek_element_get_name(element);
-    g_hash_table_remove (keyboard->priv->names,
-                         name);
+    guint keycode = eek_key_get_keycode (EEK_KEY(element));
+    g_hash_table_remove (keyboard->priv->keycodes,
+                         GUINT_TO_POINTER(keycode));
 }

 static EekSection *
@ -211,58 +203,15 @@ eek_keyboard_get_property (GObject    *object,
 }

 static void
-set_level_from_modifiers (EekKeyboard *self, EekKey *key)
+set_level_from_modifiers (EekKeyboard *self)
 {
    EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
+    gint level = 0;

-    /* The levels are: 0 Letters, 1 Upper case letters, 2 Numbers, 3 Symbols */
-
-    /* Use the numbers/letters bit from the old level */
-    gint level = priv->old_level & 2;
-
-    /* Handle non-emitting keys */
-    if (key) {
-        const gchar *name = eek_element_get_name(EEK_ELEMENT(key));
-        if (g_strcmp0(name, "ABC123") == 0)
-            level ^= 2;
-    }
-
-    level |= ((priv->modifiers & EEK_SHIFT_MASK) ? 1 : 0);
-
-    switch (priv->old_level) {
-    case VIEW_LETTERS_UPPER:
-    {
-        /* Redirect upper case letters to numbers instead of symbols, clearing
-           the shift modifier to keep the modifiers in sync with the level */
-        if (level == VIEW_SYMBOLS) {
-            level = VIEW_NUMBERS;
-            priv->modifiers &= ~EEK_SHIFT_MASK;
-        }
-        break;
-    }
-    case VIEW_SYMBOLS:
-    {
-        /* Redirect symbols to lower case letters instead of upper case,
-           clearing the shift modifier to keep the modifiers in sync with the
-           level */
-        if (level == VIEW_LETTERS_UPPER) {
-            level = VIEW_LETTERS_LOWER;
-            priv->modifiers &= ~EEK_SHIFT_MASK;
-        }
-        break;
-    }
-    case VIEW_LETTERS_LOWER:    /* Direct transitions between views */
-    case VIEW_NUMBERS:
-    default:
-        break;
-    }
-
-    if (level == VIEW_NUMBERS || level == VIEW_SYMBOLS)
-        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LOCK;
-    else
-        priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LATCH;
-
-    priv->old_level = level;
+    if (priv->modifiers & priv->alt_gr_mask)
+        level |= 2;
+    if (priv->modifiers & EEK_SHIFT_MASK)
+        level |= 1;
    eek_element_set_level (EEK_ELEMENT(self), level);
 }

@ -318,7 +267,7 @@ void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestam
    EekModifierType modifier = eek_symbol_get_modifier_mask (symbol);
    if (priv->modifier_behavior == EEK_MODIFIER_BEHAVIOR_NONE) {
        set_modifiers_with_key (keyboard, key, priv->modifiers | modifier);
-        set_level_from_modifiers (keyboard, key);
+        set_level_from_modifiers (keyboard);
    }

    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event
@ -367,7 +316,7 @@ void eek_keyboard_release_key( EekKeyboard *keyboard,
                                    (priv->modifiers ^ modifier) & modifier);
        break;
    }
-    set_level_from_modifiers (keyboard, key);
+    set_level_from_modifiers (keyboard);

    // "Borrowed" from eek-context-service; doesn't influence the state but forwards the event

@ -400,7 +349,7 @@ eek_keyboard_finalize (GObject *object)
    g_list_free_full (priv->locked_keys,
                      (GDestroyNotify) eek_modifier_key_free);

-    g_hash_table_destroy (priv->names);
+    g_hash_table_destroy (priv->keycodes);

    for (i = 0; i < priv->outline_array->len; i++) {
        EekOutline *outline = &g_array_index (priv->outline_array,
@ -441,6 +390,9 @@ eek_keyboard_class_init (EekKeyboardClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekKeyboardPrivate));
+
    klass->create_section = eek_keyboard_real_create_section;

    /* signals */
@ -528,7 +480,7 @@ eek_keyboard_init (EekKeyboard *self)
    self->priv = EEK_KEYBOARD_GET_PRIVATE(self);
    self->priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_NONE;
    self->priv->outline_array = g_array_new (FALSE, TRUE, sizeof (EekOutline));
-    self->priv->names = g_hash_table_new (g_str_hash, g_str_equal);
+    self->priv->keycodes = g_hash_table_new (g_direct_hash, g_direct_equal);
    eek_element_set_symbol_index (EEK_ELEMENT(self), 0, 0);
 }

@ -548,20 +500,20 @@ eek_keyboard_create_section (EekKeyboard *keyboard)
 }

 /**
- * eek_keyboard_find_key_by_name:
+ * eek_keyboard_find_key_by_keycode:
 * @keyboard: an #EekKeyboard
- * @name: a key name
+ * @keycode: a keycode
 *
- * Find an #EekKey whose name is @name.
- * Return value: (transfer none): #EekKey whose name is @name
+ * Find an #EekKey whose keycode is @keycode.
+ * Return value: (transfer none): #EekKey whose keycode is @keycode
 */
 EekKey *
-eek_keyboard_find_key_by_name (EekKeyboard *keyboard,
-                               const gchar *name)
+eek_keyboard_find_key_by_keycode (EekKeyboard *keyboard,
+                                  guint        keycode)
 {
    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
-    return g_hash_table_lookup (keyboard->priv->names,
-                                name);
+    return g_hash_table_lookup (keyboard->priv->keycodes,
+                                GUINT_TO_POINTER(keycode));
 }

 /**
@ -633,7 +585,7 @@ eek_keyboard_set_modifiers (EekKeyboard    *keyboard,
 {
    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
    keyboard->priv->modifiers = modifiers;
-    set_level_from_modifiers (keyboard, NULL);
+    set_level_from_modifiers (keyboard);
 }

 /**
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -69,8 +69,8 @@ struct _EekKeyboard
 /**
 * EekKeyboardClass:
 * @create_section: virtual function for creating a section
- * @find_key_by_name: virtual function for finding a key in the
- * keyboard by name
+ * @find_key_by_keycode: virtual function for finding a key in the
+ * keyboard by keycode
 * @key_pressed: class handler for #EekKeyboard::key-pressed signal
 * @key_released: class handler for #EekKeyboard::key-released signal
 * @key_locked: class handler for #EekKeyboard::key-locked signal
@ -89,8 +89,8 @@ struct _EekKeyboardClass
    /*< public >*/
    EekSection *(* create_section)      (EekKeyboard *self);

-    EekKey     *(* find_key_by_name)    (EekKeyboard *self,
-                                         const gchar *name);
+    EekKey     *(* find_key_by_keycode) (EekKeyboard *self,
+                                         guint        keycode);

    /*< private >*/
    /* obsolete members moved to EekElement */
@ -155,9 +155,9 @@ EekModifierType     eek_keyboard_get_modifiers
 EekSection         *eek_keyboard_create_section
                                     (EekKeyboard        *keyboard);

-EekKey             *eek_keyboard_find_key_by_name
+EekKey             *eek_keyboard_find_key_by_keycode
                                     (EekKeyboard        *keyboard,
-                                      const gchar        *name);
+                                      guint               keycode);

 guint               eek_keyboard_add_outline
                                     (EekKeyboard        *keyboard,
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@ -50,10 +50,9 @@
 #define EEK_KEYSYM_Hyper_L 0xffed
 #define EEK_KEYSYM_Hyper_R 0xffee

-typedef struct _EekKeysymPrivate
-{
+struct _EekKeysymPrivate {
    guint xkeysym;
-} EekKeysymPrivate;
+};

 struct _EekKeysymEntry {
    guint xkeysym;
@ -69,11 +68,12 @@ typedef struct _EekKeysymEntry EekKeysymEntry;

 static void eek_serializable_iface_init (EekSerializableIface *iface);

-G_DEFINE_TYPE_EXTENDED (EekKeysym, eek_keysym, EEK_TYPE_SYMBOL,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE (EekKeysym)
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-                                               eek_serializable_iface_init))
+G_DEFINE_TYPE_WITH_CODE (EekKeysym, eek_keysym, EEK_TYPE_SYMBOL,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+                                                eek_serializable_iface_init));
+
+#define EEK_KEYSYM_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYSYM, EekKeysymPrivate))

 static EekSerializableIface *eek_keysym_parent_serializable_iface;

@ -81,8 +81,7 @@ static void
 eek_keysym_real_serialize (EekSerializable *self,
                           GVariantBuilder *builder)
 {
-    EekKeysymPrivate *priv = eek_keysym_get_instance_private (
-		    EEK_KEYSYM(self));
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);

    eek_keysym_parent_serializable_iface->serialize (self, builder);

@ -94,8 +93,7 @@ eek_keysym_real_deserialize (EekSerializable *self,
                             GVariant        *variant,
                             gsize            index)
 {
-    EekKeysymPrivate *priv = eek_keysym_get_instance_private (
-		    EEK_KEYSYM(self));
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);

    index = eek_keysym_parent_serializable_iface->deserialize (self,
                                                               variant,
@ -202,13 +200,15 @@ get_modifier_mask (guint xkeysym)
 static void
 eek_keysym_class_init (EekKeysymClass *klass)
 {
-    /* void */
+    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (gobject_class, sizeof (EekKeysymPrivate));
 }

 static void
 eek_keysym_init (EekKeysym *self)
 {
-    /* void */
+    self->priv = EEK_KEYSYM_GET_PRIVATE(self);
 }

 /**
@ -291,7 +291,7 @@ eek_keysym_new_with_modifier (guint           xkeysym,
        g_slice_free (EekKeysymEntry, unichar_entry);
    }

-    priv = eek_keysym_get_instance_private (keysym);
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
    priv->xkeysym = xkeysym;

    return keysym;
@ -345,6 +345,6 @@ eek_keysym_get_xkeysym (EekKeysym *keysym)
    EekKeysymPrivate *priv;

    g_assert (EEK_IS_KEYSYM(keysym));
-    priv = eek_keysym_get_instance_private (keysym);
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
    return priv->xkeysym;
 }
--- a/eek/eek-keysym.h
+++ b/eek/eek-keysym.h
@ -38,7 +38,27 @@ G_BEGIN_DECLS
 #define EEK_INVALID_KEYSYM (0)

 #define EEK_TYPE_KEYSYM (eek_keysym_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekKeysym, eek_keysym, EEK, KEYSYM, EekSymbol)
+#define EEK_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEYSYM, EekKeysym))
+#define EEK_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEYSYM, EekKeysymClass))
+#define EEK_IS_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEYSYM))
+#define EEK_IS_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEYSYM))
+#define EEK_KEYSYM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEYSYM, EekKeysymClass))
+
+typedef struct _EekKeysymClass EekKeysymClass;
+typedef struct _EekKeysymPrivate EekKeysymPrivate;
+
+/**
+ * EekKeysym:
+ *
+ * The #EekKeysym structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekKeysym {
+    /*< private >*/
+    EekSymbol parent;
+
+    EekKeysymPrivate *priv;
+};

 struct _EekKeysymClass {
    /*< private >*/
--- a/eek/eek-layout.c
+++ b/eek/eek-layout.c
@ -34,7 +34,7 @@
 #include "eek-keyboard.h"
 #include "eekboard/eekboard-context-service.h"

-G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT);

 static void
 eek_layout_class_init (EekLayoutClass *klass)
--- a/eek/eek-layout.h
+++ b/eek/eek-layout.h
@ -31,7 +31,20 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_LAYOUT (eek_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
+#define EEK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_LAYOUT, EekLayout))
+#define EEK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_LAYOUT, EekLayoutClass))
+#define EEK_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_LAYOUT))
+#define EEK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_LAYOUT))
+#define EEK_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_LAYOUT, EekLayoutClass))
+
+typedef struct _EekLayoutClass EekLayoutClass;
+typedef struct _EekLayout EekLayout;
+
+struct _EekLayout
+{
+    /*< private >*/
+    GObject parent;
+};

 /**
 * EekLayoutClass:
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -1,17 +1,17 @@
-/*
+/* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
- *
+ * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation; either version 2 of
 * the License, or (at your option) any later version.
- *
+ * 
 * This library is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- *
+ * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@ -36,7 +36,12 @@ enum {
    PROP_LAST
 };

-typedef struct _EekRendererPrivate
+G_DEFINE_TYPE (EekRenderer, eek_renderer, G_TYPE_OBJECT);
+
+#define EEK_RENDERER_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_RENDERER, EekRendererPrivate))
+
+struct _EekRendererPrivate
 {
    EekKeyboard *keyboard;
    PangoContext *pcontext;
@ -57,9 +62,7 @@ typedef struct _EekRendererPrivate
    gulong symbol_index_changed_handler;

    EekTheme *theme;
-} EekRendererPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
+};

 static const EekColor DEFAULT_FOREGROUND_COLOR = {0.3, 0.3, 0.3, 1.0};
 static const EekColor DEFAULT_BACKGROUND_COLOR = {1.0, 1.0, 1.0, 1.0};
@ -103,13 +106,13 @@ create_keyboard_surface_key_callback (EekElement *element,
                                      gpointer    user_data)
 {
    CreateKeyboardSurfaceCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
    EekBounds bounds;

    cairo_save (data->cr);

    eek_element_get_bounds (element, &bounds);
-    cairo_translate (data->cr, bounds.x * priv->scale, bounds.y * priv->scale);
+    cairo_translate (data->cr, bounds.x * priv->scale, bounds.y * priv->scale); 
    cairo_rectangle (data->cr,
                     0.0,
                     0.0,
@ -126,7 +129,7 @@ create_keyboard_surface_section_callback (EekElement *element,
                                          gpointer    user_data)
 {
    CreateKeyboardSurfaceCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
    EekBounds bounds;
    gint angle;

@ -137,7 +140,7 @@ create_keyboard_surface_section_callback (EekElement *element,

    angle = eek_section_get_angle (EEK_SECTION(element));
    cairo_rotate (data->cr, angle * G_PI / 180);
-
+    
    eek_container_foreach_child (EEK_CONTAINER(element),
                                 create_keyboard_surface_key_callback,
                                 data);
@ -148,7 +151,7 @@ create_keyboard_surface_section_callback (EekElement *element,
 static cairo_surface_t *
 create_keyboard_surface (EekRenderer *renderer)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
    EekBounds bounds;
    cairo_surface_t *keyboard_surface;
    CreateKeyboardSurfaceCallbackData data;
@ -162,14 +165,9 @@ create_keyboard_surface (EekRenderer *renderer)
                                       &background);

    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
-
-    /* Create a surface that encompasses the dimensions of the keyboard as well
-       as the margin around the edge. */
-    keyboard_surface = cairo_image_surface_create (
-        CAIRO_FORMAT_ARGB32,
-        ceil(((bounds.x * 2) + bounds.width) * priv->scale),
-        ceil(((bounds.y * 2) + bounds.height) * priv->scale));
-
+    keyboard_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                   ceil(bounds.width * priv->scale),
+                                                   ceil(bounds.height * priv->scale));
    data.cr = cairo_create (keyboard_surface);
    data.renderer = renderer;

@ -204,7 +202,7 @@ render_key_outline (EekRenderer *renderer,
                    EekKey      *key,
                    gboolean     active)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
    EekOutline *outline;
    EekBounds bounds;
    guint oref;
@ -218,7 +216,7 @@ render_key_outline (EekRenderer *renderer,
    outline = eek_keyboard_get_outline (priv->keyboard, oref);
    if (outline == NULL)
        return;
-
+    
    theme_node = g_object_get_data (G_OBJECT(key),
                                    active ?
                                    "theme-node-pressed" :
@ -248,9 +246,7 @@ render_key_outline (EekRenderer *renderer,
        border_color.alpha = foreground.alpha;
    }

-    eek_element_get_bounds(EEK_ELEMENT(key), &bounds);
    outline = eek_outline_copy (outline);
-
    for (guint i = 0; i < outline->num_points; i++) {
        outline->points[i].x *= priv->scale;
        outline->points[i].y *= priv->scale;
@ -355,7 +351,7 @@ static void
 calculate_font_size_key_callback (EekElement *element, gpointer user_data)
 {
    CalculateFontSizeCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
    gdouble sx, sy;
    PangoFontDescription *font;
    PangoRectangle extents = { 0, };
@ -415,7 +411,7 @@ calculate_font_size (EekRenderer                *renderer,
                     const PangoFontDescription *base_font,
                     gboolean                    ascii)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
    CalculateFontSizeCallbackData data;

    data.size = G_MAXDOUBLE;
@ -434,7 +430,7 @@ render_key (EekRenderer *self,
            EekKey      *key,
            gboolean     active)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
    EekOutline *outline;
    cairo_surface_t *outline_surface;
    EekBounds bounds;
@ -464,8 +460,7 @@ render_key (EekRenderer *self,
    if (!outline_surface) {
        cairo_t *cr;

-        // Outline will be drawn on the outside of the button, so the
-        // surface needs to be bigger than the button
+        // Outline will be drawn on the outside of the button, so the surface needs to be bigger than the button
        outline_surface =
            cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
                                        (int)ceil(bounds.width) + 10,
@ -491,38 +486,44 @@ render_key (EekRenderer *self,
    cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
    cairo_paint (cr);

-    eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
    /* render icon (if any) */
    symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
    if (!symbol)
        return;

- #define SCALE 0.4
    if (eek_symbol_get_icon_name (symbol)) {
-
        cairo_surface_t *icon_surface =
            eek_renderer_get_icon_surface (self,
                                           eek_symbol_get_icon_name (symbol),
-                                           MIN(bounds.width, bounds.height));
+                                           MIN(bounds.width, bounds.height) * 0.7);
        if (icon_surface) {
            gint width = cairo_image_surface_get_width (icon_surface);
            gint height = cairo_image_surface_get_height (icon_surface);
+            gdouble scale;
+
+            if (width < bounds.width && height < bounds.height)
+                scale = 1;
+            else {
+                if (height * bounds.width / width <= bounds.height)
+                    scale = bounds.width / width;
+                else if (width * bounds.height / height <= bounds.width)
+                    scale = bounds.height / height;
+                else {
+                    if (width * bounds.height < height * bounds.width)
+                        scale = width / bounds.width;
+                    else
+                        scale = height / bounds.height;
+                }
+            }

            cairo_save (cr);
            cairo_translate (cr,
-                             (bounds.width - width * SCALE) / 2,
-                             (bounds.height - height * SCALE) / 2);
+                             (bounds.width - width * scale) / 2,
+                             (bounds.height - height * scale) / 2);
            cairo_rectangle (cr, 0, 0, width, height);
-            cairo_scale (cr, SCALE, SCALE);
            cairo_clip (cr);
-            /* Draw the shape of the icon using the foreground color */
-            cairo_set_source_rgba (cr, foreground.red,
-                                       foreground.green,
-                                       foreground.blue,
-                                       foreground.alpha);
-            cairo_mask_surface (cr, icon_surface, 0.0, 0.0);
-            cairo_fill (cr);
-
+            cairo_set_source_surface (cr, icon_surface, 0.0, 0.0);
+            cairo_paint (cr);
            cairo_restore (cr);
            return;
        }
@ -539,6 +540,7 @@ render_key (EekRenderer *self,
         (bounds.width - extents.width / PANGO_SCALE) / 2,
         (bounds.height - extents.height / PANGO_SCALE) / 2);

+    eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
    cairo_set_source_rgba (cr,
                           foreground.red,
                           foreground.green,
@ -601,7 +603,7 @@ eek_renderer_real_render_key_label (EekRenderer *self,
                                    PangoLayout *layout,
                                    EekKey      *key)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
    EekSymbol *symbol;
    EekSymbolCategory category;
    const gchar *label;
@ -694,7 +696,7 @@ static void
 eek_renderer_real_render_keyboard (EekRenderer *self,
                                   cairo_t     *cr)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
    cairo_pattern_t *source;

    g_return_if_fail (priv->keyboard);
@ -716,8 +718,7 @@ eek_renderer_set_property (GObject      *object,
                           const GValue *value,
                           GParamSpec   *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
-		    EEK_RENDERER(object));
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);

    switch (prop_id) {
    case PROP_KEYBOARD:
@ -745,8 +746,7 @@ eek_renderer_get_property (GObject    *object,
                           GValue     *value,
                           GParamSpec *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
-		    EEK_RENDERER(object));
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);

    switch (prop_id) {
    case PROP_KEYBOARD:
@ -761,8 +761,7 @@ eek_renderer_get_property (GObject    *object,
 static void
 eek_renderer_dispose (GObject *object)
 {
-    EekRenderer        *self = EEK_RENDERER (object);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);

    if (priv->keyboard) {
        if (g_signal_handler_is_connected (priv->keyboard,
@ -786,9 +785,7 @@ eek_renderer_dispose (GObject *object)
 static void
 eek_renderer_finalize (GObject *object)
 {
-    EekRenderer        *self = EEK_RENDERER(object);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
-
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
    g_hash_table_destroy (priv->outline_surface_cache);
    g_hash_table_destroy (priv->active_outline_surface_cache);
    pango_font_description_free (priv->ascii_font);
@ -802,6 +799,9 @@ eek_renderer_class_init (EekRendererClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekRendererPrivate));
+
    klass->render_key_label = eek_renderer_real_render_key_label;
    klass->render_key_outline = eek_renderer_real_render_key_outline;
    klass->render_key = eek_renderer_real_render_key;
@ -834,8 +834,9 @@ eek_renderer_class_init (EekRendererClass *klass)
 static void
 eek_renderer_init (EekRenderer *self)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv;

+    priv = self->priv = EEK_RENDERER_GET_PRIVATE(self);
    priv->keyboard = NULL;
    priv->pcontext = NULL;
    priv->default_foreground_color = DEFAULT_FOREGROUND_COLOR;
@ -862,17 +863,15 @@ eek_renderer_init (EekRenderer *self)
 static void
 invalidate (EekRenderer *renderer)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    if (renderer->priv->outline_surface_cache)
+        g_hash_table_remove_all (renderer->priv->outline_surface_cache);

-    if (priv->outline_surface_cache)
-        g_hash_table_remove_all (priv->outline_surface_cache);
+    if (renderer->priv->active_outline_surface_cache)
+        g_hash_table_remove_all (renderer->priv->active_outline_surface_cache);

-    if (priv->active_outline_surface_cache)
-        g_hash_table_remove_all (priv->active_outline_surface_cache);
-
-    if (priv->keyboard_surface) {
-        cairo_surface_destroy (priv->keyboard_surface);
-        priv->keyboard_surface = NULL;
+    if (renderer->priv->keyboard_surface) {
+        cairo_surface_destroy (renderer->priv->keyboard_surface);
+        renderer->priv->keyboard_surface = NULL;
    }
 }

@ -907,12 +906,10 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    renderer->priv->allocation_width = width;
+    renderer->priv->allocation_height = height;

-    priv->allocation_width = width;
-    priv->allocation_height = height;
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);

    if (bounds.height * width / bounds.width <= height)
        scale = width / bounds.width;
@ -925,8 +922,8 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
            scale = bounds.height / height;
    }

-    if (scale != priv->scale) {
-        priv->scale = scale;
+    if (scale != renderer->priv->scale) {
+        renderer->priv->scale = scale;
        invalidate (renderer);
    }
 }
@ -940,13 +937,11 @@ eek_renderer_get_size (EekRenderer *renderer,

    g_return_if_fail (EEK_IS_RENDERER(renderer));

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);
    if (width)
-        *width = bounds.width * priv->scale;
+        *width = bounds.width * renderer->priv->scale;
    if (height)
-        *height = bounds.height * priv->scale;
+        *height = bounds.height * renderer->priv->scale;
 }

 void
@ -965,22 +960,20 @@ eek_renderer_get_key_bounds (EekRenderer *renderer,
    g_return_if_fail (EEK_IS_KEY(key));
    g_return_if_fail (bounds != NULL);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
    section = eek_element_get_parent (EEK_ELEMENT(key));

    eek_element_get_bounds (EEK_ELEMENT(key), bounds);
    eek_element_get_bounds (section, &section_bounds);
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard),
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard),
                            &keyboard_bounds);

    if (!rotate) {
        bounds->x += keyboard_bounds.x + section_bounds.x;
        bounds->y += keyboard_bounds.y + section_bounds.y;
-        bounds->x *= priv->scale;
-        bounds->y *= priv->scale;
-        bounds->width *= priv->scale;
-        bounds->height *= priv->scale;
+        bounds->x *= renderer->priv->scale;
+        bounds->y *= renderer->priv->scale;
+        bounds->width *= renderer->priv->scale;
+        bounds->height *= renderer->priv->scale;
        return;
    }
    points[0].x = bounds->x;
@ -1012,30 +1005,24 @@ eek_renderer_get_key_bounds (EekRenderer *renderer,
    bounds->y = keyboard_bounds.y + section_bounds.y + min.y;
    bounds->width = (max.x - min.x);
    bounds->height = (max.y - min.y);
-    bounds->x *= priv->scale;
-    bounds->y *= priv->scale;
-    bounds->width *= priv->scale;
-    bounds->height *= priv->scale;
+    bounds->x *= renderer->priv->scale;
+    bounds->y *= renderer->priv->scale;
+    bounds->width *= renderer->priv->scale;
+    bounds->height *= renderer->priv->scale;
 }

 gdouble
 eek_renderer_get_scale (EekRenderer *renderer)
 {
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), 0);
-
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return priv->scale;
+    return renderer->priv->scale;
 }

 PangoLayout *
 eek_renderer_create_pango_layout (EekRenderer  *renderer)
 {
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
-
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return pango_layout_new (priv->pcontext);
+    return pango_layout_new (renderer->priv->pcontext);
 }

 void
@ -1113,9 +1100,7 @@ eek_renderer_set_default_foreground_color (EekRenderer    *renderer,
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (color);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    memcpy (&priv->default_foreground_color, color, sizeof(EekColor));
+    memcpy (&renderer->priv->default_foreground_color, color, sizeof(EekColor));
 }

 void
@ -1125,9 +1110,7 @@ eek_renderer_set_default_background_color (EekRenderer    *renderer,
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (color);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    memcpy (&priv->default_background_color, color, sizeof(EekColor));
+    memcpy (&renderer->priv->default_background_color, color, sizeof(EekColor));
 }

 void
@ -1140,13 +1123,11 @@ eek_renderer_get_foreground_color (EekRenderer *renderer,
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (color);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
    theme_node = g_object_get_data (G_OBJECT(element), "theme-node");
    if (theme_node)
        eek_theme_node_get_foreground_color (theme_node, color);
    else
-        memcpy (color, &priv->default_foreground_color,
+        memcpy (color, &renderer->priv->default_foreground_color,
                sizeof(EekColor));
 }

@ -1160,13 +1141,11 @@ eek_renderer_get_background_color (EekRenderer *renderer,
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (color);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
    theme_node = g_object_get_data (G_OBJECT(element), "theme-node");
    if (theme_node)
        eek_theme_node_get_background_color (theme_node, color);
    else
-        memcpy (color, &priv->default_background_color,
+        memcpy (color, &renderer->priv->default_background_color,
                sizeof(EekColor));
 }

@ -1229,14 +1208,12 @@ find_key_by_position_key_callback (EekElement *element,
    points[3].x = points[0].x;
    points[3].y = points[2].y;

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
    for (i = 0; i < G_N_ELEMENTS(points); i++) {
        eek_point_rotate (&points[i], data->angle);
        points[i].x += data->origin.x;
        points[i].y += data->origin.y;
-        points[i].x *= priv->scale;
-        points[i].y *= priv->scale;
+        points[i].x *= data->renderer->priv->scale;
+        points[i].y *= data->renderer->priv->scale;
    }

    b1 = sign (&data->point, &points[0], &points[1]) < 0.0;
@ -1291,14 +1268,12 @@ eek_renderer_find_key_by_position (EekRenderer *renderer,

    g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);

-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
-
-    if (x < bounds.x * priv->scale ||
-        y < bounds.y * priv->scale ||
-        x > bounds.width * priv->scale ||
-        y > bounds.height * priv->scale)
+    if (x < bounds.x * renderer->priv->scale ||
+        y < bounds.y * renderer->priv->scale ||
+        x > bounds.width * renderer->priv->scale ||
+        y > bounds.height * renderer->priv->scale)
        return NULL;

    data.point.x = x;
@ -1308,7 +1283,7 @@ eek_renderer_find_key_by_position (EekRenderer *renderer,
    data.key = NULL;
    data.renderer = renderer;

-    eek_container_find (EEK_CONTAINER(priv->keyboard),
+    eek_container_find (EEK_CONTAINER(renderer->priv->keyboard),
                        find_key_by_position_section_callback,
                        &data);
    return data.key;
@ -1328,11 +1303,9 @@ create_theme_node_key_callback (EekElement *element,
    CreateThemeNodeData *data = user_data;
    EekThemeNode *theme_node;

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
    theme_node = eek_theme_node_new (data->context,
                                     data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                     EEK_TYPE_KEY,
                                     eek_element_get_name (element),
                                     "key",
@ -1345,7 +1318,7 @@ create_theme_node_key_callback (EekElement *element,

    theme_node = eek_theme_node_new (data->context,
                                     data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                     EEK_TYPE_KEY,
                                     eek_element_get_name (element),
                                     "key",
@ -1364,11 +1337,9 @@ create_theme_node_section_callback (EekElement *element,
    CreateThemeNodeData *data = user_data;
    EekThemeNode *theme_node, *parent;

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
    theme_node = eek_theme_node_new (data->context,
                                     data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                     EEK_TYPE_SECTION,
                                     eek_element_get_name (element),
                                     "section",
@ -1397,25 +1368,22 @@ eek_renderer_set_theme (EekRenderer *renderer,

    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (EEK_IS_THEME(theme));
+    g_return_if_fail (renderer->priv->keyboard);

-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    g_return_if_fail (priv->keyboard);
-
-    if (priv->theme)
-        g_object_unref (priv->theme);
-    priv->theme = g_object_ref (theme);
+    if (renderer->priv->theme)
+        g_object_unref (renderer->priv->theme);
+    renderer->priv->theme = g_object_ref (theme);

    theme_context = eek_theme_context_new ();
    theme_node = eek_theme_node_new (theme_context,
                                     NULL,
-                                     priv->theme,
+                                     renderer->priv->theme,
                                     EEK_TYPE_KEYBOARD,
                                     "keyboard",
                                     "keyboard",
                                     NULL,
                                     NULL);
-    g_object_set_data_full (G_OBJECT(priv->keyboard),
+    g_object_set_data_full (G_OBJECT(renderer->priv->keyboard),
                            "theme-node",
                            theme_node,
                            (GDestroyNotify)g_object_unref);
@ -1423,7 +1391,7 @@ eek_renderer_set_theme (EekRenderer *renderer,
    data.context = theme_context;
    data.parent = theme_node;
    data.renderer = renderer;
-    eek_container_foreach_child (EEK_CONTAINER(priv->keyboard),
+    eek_container_foreach_child (EEK_CONTAINER(renderer->priv->keyboard),
                                 create_theme_node_section_callback,
                                 &data);
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -31,7 +31,21 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_RENDERER (eek_renderer_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+#define EEK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_RENDERER, EekRenderer))
+#define EEK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_RENDERER, EekRendererClass))
+#define EEK_IS_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_RENDERER))
+#define EEK_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_RENDERER))
+#define EEK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_RENDERER, EekRendererClass))
+
+typedef struct _EekRenderer EekRenderer;
+typedef struct _EekRendererClass EekRendererClass;
+typedef struct _EekRendererPrivate EekRendererPrivate;
+
+struct _EekRenderer {
+    GObject parent;
+
+    EekRendererPrivate *priv;
+};

 struct _EekRendererClass
 {
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@ -1,17 +1,17 @@
-/*
+/* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
- *
+ * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation; either version 2 of
 * the License, or (at your option) any later version.
- *
+ * 
 * This library is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- *
+ * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@ -52,6 +52,11 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

+G_DEFINE_TYPE (EekSection, eek_section, EEK_TYPE_CONTAINER);
+
+#define EEK_SECTION_GET_PRIVATE(obj)                           \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SECTION, EekSectionPrivate))
+
 struct _EekRow
 {
    gint num_columns;
@ -60,19 +65,17 @@ struct _EekRow

 typedef struct _EekRow EekRow;

-typedef struct _EekSectionPrivate
+struct _EekSectionPrivate
 {
    gint angle;
    GSList *rows;
    EekModifierType modifiers;
-} EekSectionPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekSection, eek_section, EEK_TYPE_CONTAINER)
+};

 static gint
 eek_section_real_get_n_rows (EekSection *self)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);

    return g_slist_length (priv->rows);
 }
@ -82,7 +85,7 @@ eek_section_real_add_row (EekSection    *self,
                          gint           num_columns,
                          EekOrientation orientation)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
    EekRow *row;

    row = g_slice_new (EekRow);
@ -97,7 +100,7 @@ eek_section_real_get_row (EekSection     *self,
                          gint           *num_columns,
                          EekOrientation *orientation)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
    EekRow *row;

    row = g_slist_nth_data (priv->rows, index);
@ -124,10 +127,9 @@ on_unlocked (EekKey     *key,

 static EekKey *
 eek_section_real_create_key (EekSection *self,
-                             const gchar *name,
-                             gint        keycode,
+                             guint       keycode,
                             gint        column_index,
-                             gint        row_index)
+                             guint        row_index)
 {
    EekKey *key;
    gint num_rows;
@ -136,14 +138,11 @@ eek_section_real_create_key (EekSection *self,
    num_rows = eek_section_get_n_rows (self);
    g_return_val_if_fail (0 <= row_index && row_index < num_rows, NULL);

-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
-
-    row = g_slist_nth_data (priv->rows, row_index);
+    row = g_slist_nth_data (self->priv->rows, row_index);
    if (row->num_columns < column_index + 1)
        row->num_columns = column_index + 1;

    key = g_object_new (EEK_TYPE_KEY,
-                        "name", name,
                        "keycode", keycode,
                        "column", column_index,
                        "row", row_index,
@ -159,7 +158,7 @@ eek_section_real_create_key (EekSection *self,
 static void
 set_level_from_modifiers (EekSection *self)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
    EekKeyboard *keyboard;
    EekModifierType num_lock_mask;
    gint level = -1;
@ -174,7 +173,7 @@ set_level_from_modifiers (EekSection *self)
 static void
 eek_section_real_key_pressed (EekSection *self, EekKey *key)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
    EekSymbol *symbol;
    EekKeyboard *keyboard;
    EekModifierBehavior behavior;
@ -196,7 +195,7 @@ eek_section_real_key_pressed (EekSection *self, EekKey *key)
 static void
 eek_section_real_key_released (EekSection *self, EekKey *key)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
    EekSymbol *symbol;
    EekKeyboard *keyboard;
    EekModifierBehavior behavior;
@ -226,8 +225,7 @@ eek_section_real_key_released (EekSection *self, EekKey *key)
 static void
 eek_section_finalize (GObject *object)
 {
-    EekSection        *self = EEK_SECTION (object);
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(object);
    GSList *head;

    for (head = priv->rows; head; head = g_slist_next (head))
@ -293,6 +291,8 @@ eek_section_class_init (EekSectionClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekSectionPrivate));
+
    klass->get_n_rows = eek_section_real_get_n_rows;
    klass->add_row = eek_section_real_add_row;
    klass->get_row = eek_section_real_get_row;
@ -367,7 +367,7 @@ eek_section_class_init (EekSectionClass *klass)
 static void
 eek_section_init (EekSection *self)
 {
-    /* void */
+    self->priv = EEK_SECTION_GET_PRIVATE (self);
 }

 /**
@ -382,11 +382,8 @@ eek_section_set_angle (EekSection  *section,
                       gint         angle)
 {
    g_return_if_fail (EEK_IS_SECTION(section));
-
-    EekSectionPrivate *priv = eek_section_get_instance_private (section);
-
-    if (priv->angle != angle) {
-        priv->angle = angle;
+    if (section->priv->angle != angle) {
+        section->priv->angle = angle;
        g_object_notify (G_OBJECT(section), "angle");
    }
 }
@ -401,10 +398,7 @@ gint
 eek_section_get_angle (EekSection *section)
 {
    g_return_val_if_fail (EEK_IS_SECTION(section), -1);
-
-    EekSectionPrivate *priv = eek_section_get_instance_private (section);
-
-    return priv->angle;
+    return section->priv->angle;
 }

 /**
@ -465,7 +459,6 @@ eek_section_get_row (EekSection     *section,
 /**
 * eek_section_create_key:
 * @section: an #EekSection
- * @name: a name
 * @keycode: a keycode
 * @column: the column index of the key
 * @row: the row index of the key
@ -476,14 +469,12 @@ eek_section_get_row (EekSection     *section,
 */
 EekKey *
 eek_section_create_key (EekSection *section,
-                        const gchar *name,
-                        gint        keycode,
+                        guint       keycode,
                        gint        column,
                        gint        row)
 {
    g_return_val_if_fail (EEK_IS_SECTION(section), NULL);
    return EEK_SECTION_GET_CLASS(section)->create_key (section,
-                                                       name,
                                                       keycode,
                                                       column,
                                                       row);
--- a/eek/eek-section.h
+++ b/eek/eek-section.h
@ -32,7 +32,28 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_SECTION (eek_section_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekSection, eek_section, EEK, SECTION, EekContainer)
+#define EEK_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SECTION, EekSection))
+#define EEK_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SECTION, EekSectionClass))
+#define EEK_IS_SECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SECTION))
+#define EEK_IS_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SECTION))
+#define EEK_SECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SECTION, EekSectionClass))
+
+typedef struct _EekSectionClass EekSectionClass;
+typedef struct _EekSectionPrivate EekSectionPrivate;
+
+/**
+ * EekSection:
+ *
+ * The #EekSection structure contains only private data and should
+ * only be accessed using the provided API.
+ */
+struct _EekSection
+{
+    /*< private >*/
+    EekContainer parent;
+
+    EekSectionPrivate *priv;
+};

 /**
 * EekSectionClass:
@ -62,8 +83,7 @@ struct _EekSectionClass
                                     EekOrientation *orientation);

    EekKey *(* create_key)          (EekSection     *self,
-                                     const gchar    *name,
-                                     gint            keycode,
+                                     guint           keycode,
                                     gint            row,
                                     gint            column);

@ -100,8 +120,7 @@ void    eek_section_get_row              (EekSection     *section,
                                          EekOrientation *orientation);

 EekKey *eek_section_create_key           (EekSection     *section,
-                                          const gchar    *name,
-                                          gint            keycode,
+                                          guint           keycode,
                                          gint            column,
                                          gint            row);

--- a/eek/eek-symbol.c
+++ b/eek/eek-symbol.c
@ -44,31 +44,29 @@ enum {
    PROP_LAST
 };

-typedef struct _EekSymbolPrivate
-{
+struct _EekSymbolPrivate {
    gchar *name;
    gchar *label;
    EekSymbolCategory category;
    EekModifierType modifier_mask;
    gchar *icon_name;
    gchar *tooltip;
-} EekSymbolPrivate;
+};

 static void eek_serializable_iface_init (EekSerializableIface *iface);

-G_DEFINE_TYPE_EXTENDED (EekSymbol,
-			eek_symbol,
-			G_TYPE_OBJECT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE (EekSymbol)
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-                                               eek_serializable_iface_init))
+G_DEFINE_TYPE_WITH_CODE (EekSymbol, eek_symbol, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+                                                eek_serializable_iface_init));
+
+#define EEK_SYMBOL_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SYMBOL, EekSymbolPrivate))

 static void
 eek_symbol_real_serialize (EekSerializable *self,
                           GVariantBuilder *builder)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (EEK_SYMBOL (self));
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);
 #define NOTNULL(s) ((s) != NULL ? (s) : "")
    g_variant_builder_add (builder, "s", NOTNULL(priv->name));
    g_variant_builder_add (builder, "s", NOTNULL(priv->label));
@ -84,7 +82,7 @@ eek_symbol_real_deserialize (EekSerializable *self,
                             GVariant        *variant,
                             gsize            index)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (EEK_SYMBOL (self));
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);

    g_variant_get_child (variant, index++, "s", &priv->name);
    g_variant_get_child (variant, index++, "s", &priv->label);
@ -174,8 +172,7 @@ eek_symbol_get_property (GObject    *object,
 static void
 eek_symbol_finalize (GObject *object)
 {
-    EekSymbol        *self = EEK_SYMBOL (object);
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (self);
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(object);

    g_free (priv->name);
    g_free (priv->label);
@ -190,6 +187,8 @@ eek_symbol_class_init (EekSymbolClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekSymbolPrivate));
+
    gobject_class->set_property = eek_symbol_set_property;
    gobject_class->get_property = eek_symbol_get_property;
    gobject_class->finalize = eek_symbol_finalize;
@ -242,8 +241,9 @@ eek_symbol_class_init (EekSymbolClass *klass)
 static void
 eek_symbol_init (EekSymbol *self)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (self);
+    EekSymbolPrivate *priv;

+    priv = self->priv = EEK_SYMBOL_GET_PRIVATE(self);
    priv->category = EEK_SYMBOL_CATEGORY_UNKNOWN;
 }

@ -270,10 +270,11 @@ void
 eek_symbol_set_name (EekSymbol   *symbol,
                     const gchar *name)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    g_free (priv->name);
    priv->name = g_strdup (name);
 }
@ -287,10 +288,11 @@ eek_symbol_set_name (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_name (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    if (priv->name == NULL || *priv->name == '\0')
        return NULL;
    return priv->name;
@ -307,10 +309,11 @@ void
 eek_symbol_set_label (EekSymbol   *symbol,
                      const gchar *label)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    g_free (priv->label);
    priv->label = g_strdup (label);
 }
@ -324,10 +327,11 @@ eek_symbol_set_label (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_label (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    if (priv->label == NULL || *priv->label == '\0')
        return NULL;
    return priv->label;
@ -344,10 +348,11 @@ void
 eek_symbol_set_category (EekSymbol        *symbol,
                         EekSymbolCategory category)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    priv->category = category;
 }

@ -360,10 +365,11 @@ eek_symbol_set_category (EekSymbol        *symbol,
 EekSymbolCategory
 eek_symbol_get_category (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), EEK_SYMBOL_CATEGORY_UNKNOWN);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    return priv->category;
 }

@ -378,10 +384,11 @@ void
 eek_symbol_set_modifier_mask (EekSymbol      *symbol,
                              EekModifierType mask)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    priv->modifier_mask = mask;
 }

@ -394,10 +401,11 @@ eek_symbol_set_modifier_mask (EekSymbol      *symbol,
 EekModifierType
 eek_symbol_get_modifier_mask (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), 0);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    return priv->modifier_mask;
 }

@ -425,10 +433,11 @@ void
 eek_symbol_set_icon_name (EekSymbol   *symbol,
                          const gchar *icon_name)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    g_free (priv->icon_name);
    priv->icon_name = g_strdup (icon_name);
 }
@ -442,10 +451,11 @@ eek_symbol_set_icon_name (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_icon_name (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    if (priv->icon_name == NULL || *priv->icon_name == '\0')
        return NULL;
    return priv->icon_name;
@ -462,10 +472,11 @@ void
 eek_symbol_set_tooltip (EekSymbol   *symbol,
                        const gchar *tooltip)
 {
+    EekSymbolPrivate *priv;
+
    g_return_if_fail (EEK_IS_SYMBOL(symbol));

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    g_free (priv->tooltip);
    priv->tooltip = g_strdup (tooltip);
 }
@ -479,10 +490,11 @@ eek_symbol_set_tooltip (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_tooltip (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
    g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);

-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
-
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
    if (priv->tooltip == NULL || *priv->tooltip == '\0')
        return NULL;
    return priv->tooltip;
--- a/eek/eek-symbol.h
+++ b/eek/eek-symbol.h
@ -59,7 +59,27 @@ typedef enum {
 } EekSymbolCategory;

 #define EEK_TYPE_SYMBOL (eek_symbol_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekSymbol, eek_symbol, EEK, SYMBOL, GObject)
+#define EEK_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SYMBOL, EekSymbol))
+#define EEK_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SYMBOL, EekSymbolClass))
+#define EEK_IS_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SYMBOL))
+#define EEK_IS_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SYMBOL))
+#define EEK_SYMBOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SYMBOL, EekSymbolClass))
+
+typedef struct _EekSymbolClass EekSymbolClass;
+typedef struct _EekSymbolPrivate EekSymbolPrivate;
+
+/**
+ * EekSymbol:
+ *
+ * The #EekSymbol structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekSymbol {
+    /*< private >*/
+    GObject parent;
+
+    EekSymbolPrivate *priv;
+};

 /**
 * EekSymbolClass:
--- a/eek/eek-text.c
+++ b/eek/eek-text.c
@ -36,20 +36,18 @@ enum {
    PROP_LAST
 };

-typedef struct _EekTextPrivate
-{
+struct _EekTextPrivate {
    gchar *text;
-} EekTextPrivate;
+};

 static void eek_serializable_iface_init (EekSerializableIface *iface);

-G_DEFINE_TYPE_EXTENDED (EekText,
-			eek_text,
-			EEK_TYPE_SYMBOL,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE (EekText)
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-                                               eek_serializable_iface_init))
+G_DEFINE_TYPE_WITH_CODE (EekText, eek_text, EEK_TYPE_SYMBOL,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+                                                eek_serializable_iface_init));
+
+#define EEK_TEXT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_TEXT, EekTextPrivate))

 static EekSerializableIface *eek_text_parent_serializable_iface;

@ -57,7 +55,7 @@ static void
 eek_text_real_serialize (EekSerializable *self,
                         GVariantBuilder *builder)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (EEK_TEXT (self));
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);

    eek_text_parent_serializable_iface->serialize (self, builder);

@ -69,7 +67,7 @@ eek_text_real_deserialize (EekSerializable *self,
                           GVariant        *variant,
                           gsize            index)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (EEK_TEXT (self));
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);

    index = eek_text_parent_serializable_iface->deserialize (self,
                                                             variant,
@ -95,9 +93,7 @@ eek_text_set_property (GObject      *object,
                       const GValue *value,
                       GParamSpec   *pspec)
 {
-    EekText        *self = EEK_TEXT (object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
-
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
    switch (prop_id) {
    case PROP_TEXT:
        g_free (priv->text);
@ -111,13 +107,11 @@ eek_text_set_property (GObject      *object,

 static void
 eek_text_get_property (GObject    *object,
-                       guint       prop_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
+                         guint       prop_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
 {
-    EekText        *self = EEK_TEXT (object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
-
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
    switch (prop_id) {
    case PROP_TEXT:
        g_value_set_string (value, priv->text);
@ -131,8 +125,7 @@ eek_text_get_property (GObject    *object,
 static void
 eek_text_finalize (GObject *object)
 {
-    EekText        *self = EEK_TEXT (object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);

    g_free (priv->text);
    G_OBJECT_CLASS (eek_text_parent_class)->finalize (object);
@ -144,6 +137,8 @@ eek_text_class_init (EekTextClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekTextPrivate));
+
    gobject_class->set_property = eek_text_set_property;
    gobject_class->get_property = eek_text_get_property;
    gobject_class->finalize = eek_text_finalize;
@ -159,7 +154,7 @@ eek_text_class_init (EekTextClass *klass)
 static void
 eek_text_init (EekText *self)
 {
-    /* void */
+    self->priv = EEK_TEXT_GET_PRIVATE(self);
 }

 EekText *
@ -181,7 +176,7 @@ eek_text_new (const gchar *text)
 const gchar *
 eek_text_get_text (EekText *text)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (text);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(text);

    return priv->text;
 }
--- a/eek/eek-text.h
+++ b/eek/eek-text.h
@ -30,7 +30,27 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_TEXT (eek_text_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekText, eek_text, EEK, TEXT, EekSymbol)
+#define EEK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_TEXT, EekText))
+#define EEK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_TEXT, EekTextClass))
+#define EEK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_TEXT))
+#define EEK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_TEXT))
+#define EEK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_TEXT, EekTextClass))
+
+typedef struct _EekTextClass EekTextClass;
+typedef struct _EekTextPrivate EekTextPrivate;
+
+/**
+ * EekText:
+ *
+ * The #EekText structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekText {
+    /*< private >*/
+    EekSymbol parent;
+
+    EekTextPrivate *priv;
+};

 struct _EekTextClass {
    /*< private >*/
--- a/eek/eek-theme-node.c
+++ b/eek/eek-theme-node.c
@ -89,6 +89,9 @@ static void eek_theme_node_finalize           (GObject                 *object);

 static const EekColor BLACK_COLOR = { 0, 0, 0, 0xff };
 static const EekColor TRANSPARENT_COLOR = { 0, 0, 0, 0 };
+static const EekColor DEFAULT_SUCCESS_COLOR = { 0x4e, 0x9a, 0x06, 0xff };
+static const EekColor DEFAULT_WARNING_COLOR = { 0xf5, 0x79, 0x3e, 0xff };
+static const EekColor DEFAULT_ERROR_COLOR = { 0xcc, 0x00, 0x00, 0xff };

 static void
 eek_theme_node_init (EekThemeNode *self)
--- a/eek/eek-theme.c
+++ b/eek/eek-theme.c
@ -43,7 +43,6 @@
 * Copyright (C) 2003-2004 Dodji Seketeli.  All Rights Reserved.
 */

-#define G_LOG_DOMAIN "eek-theme"

 #include <stdlib.h>
 #include <string.h>
@ -167,65 +166,103 @@ eek_theme_class_init (EekThemeClass *klass)

 }

+/* This is a workaround for a bug in libcroco < 0.6.2 where
+ * function starting with 'r' (and 'u') are misparsed. We work
+ * around this by exploiting the fact that libcroco is incomformant
+ * with the CSS-spec and case sensitive and pre-convert all
+ * occurrences of rgba to RGBA. Then we make our own parsing
+ * code check for RGBA as well.
+ */
+#if LIBCROCO_VERSION_NUMBER < 602
+static gboolean
+is_identifier_character (char c)
+{
+  /* Actual CSS rules allow for unicode > 0x00a1 and escaped
+   * characters, but we'll assume we won't do that in our stylesheets
+   * or at least not next to the string 'rgba'.
+   */
+  return g_ascii_isalnum(c) || c == '-' || c == '_';
+}
+
+static void
+convert_rgba_RGBA (char *buf)
+{
+  char *p;
+
+  p = strstr (buf, "rgba");
+  while (p)
+    {
+      /* Check if this looks like a complete token; this is to
+       * avoiding mangling, say, a selector '.rgba-entry' */
+      if (!((p > buf && is_identifier_character (*(p - 1))) ||
+            (is_identifier_character (*(p + 4)))))
+        memcpy(p, "RGBA", 4);
+      p += 4;
+      p = strstr (p, "rgba");
+    }
+}
+
+static CRStyleSheet *
+parse_stylesheet (const char  *filename,
+                  GError     **error)
+{
+  enum CRStatus status;
+  char *contents;
+  gsize length;
+  CRStyleSheet *stylesheet = NULL;
+
+  if (filename == NULL)
+    return NULL;
+
+  if (!g_file_get_contents (filename, &contents, &length, error))
+    return NULL;
+
+  convert_rgba_RGBA (contents);
+
+  status = cr_om_parser_simply_parse_buf ((const guchar *) contents,
+                                          length,
+                                          CR_UTF_8,
+                                          &stylesheet);
+  g_free (contents);
+
+  if (status != CR_OK)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Error parsing stylesheet '%s'; errcode:%d", filename, status);
+      return NULL;
+    }
+
+  return stylesheet;
+}
+
+CRDeclaration *
+_eek_theme_parse_declaration_list (const char *str)
+{
+  char *copy = g_strdup (str);
+  CRDeclaration *result;
+
+  convert_rgba_RGBA (copy);
+
+  result = cr_declaration_parse_list_from_buf ((const guchar *)copy,
+                                               CR_UTF_8);
+  g_free (copy);
+
+  return result;
+}
+#else /* LIBCROCO_VERSION_NUMBER >= 602 */
 static CRStyleSheet *
 parse_stylesheet (const char  *filename,
                  GError     **error)
 {
  enum CRStatus status;
  CRStyleSheet *stylesheet;
-  g_autoptr (GFileInputStream) stream = NULL;
-  g_autoptr (GFileInfo) info = NULL;
-  g_autoptr (GFile) file = NULL;
-  g_autofree guchar* contents = NULL;
-  goffset size;
-  gsize out = 0;
-  GError *err = NULL;

  if (filename == NULL)
    return NULL;

-  g_debug ("Parsing %s", filename);
-  if (g_strcmp0 (filename, "resource://") > 0) {
-      file = g_file_new_for_uri (filename);
-      stream = g_file_read (file, NULL, &err);
-      if (!stream) {
-          g_warning ("Failed to open %s: %s", filename, err->message);
-          g_clear_error (&err);
-          return NULL;
-      }
-
-      info = g_file_input_stream_query_info (stream,
-                                             G_FILE_ATTRIBUTE_STANDARD_SIZE,
-                                             NULL,
-                                             &err);
-
-      if (!info) {
-          g_warning ("Failed to stat %s: %s", filename, err->message);
-          g_clear_error (&err);
-          return NULL;
-      }
-
-      size = g_file_info_get_size (info);
-      contents = g_malloc0 (size);
-      if (!g_input_stream_read_all (G_INPUT_STREAM (stream),
-                                    contents,
-                                    size,
-                                    &out,
-                                    NULL,
-                                    &err)) {
-          g_warning ("Failed to read %s: %s", filename, err->message);
-          g_clear_error (&err);
-          return NULL;
-      }
-      status = cr_om_parser_simply_parse_buf (contents,
-                                              size,
-                                              CR_UTF_8,
-                                              &stylesheet);
-  } else {
-      status = cr_om_parser_simply_parse_file ((const guchar *) filename,
-                                               CR_UTF_8,
-                                               &stylesheet);
-  }
+  status = cr_om_parser_simply_parse_file ((const guchar *) filename,
+                                           CR_UTF_8,
+                                           &stylesheet);

  if (status != CR_OK)
    {
@ -243,6 +280,7 @@ _eek_theme_parse_declaration_list (const char *str)
  return cr_declaration_parse_list_from_buf ((const guchar *)str,
                                             CR_UTF_8);
 }
+#endif /* LIBCROCO_VERSION_NUMBER < 602 */

 /* Just g_warning for now until we have something nicer to do */
 static CRStyleSheet *
--- a/eek/eek-xkb-layout.c
+++ b/eek/eek-xkb-layout.c
@ -52,13 +52,20 @@

 static void initable_iface_init (GInitableIface *initable_iface);

+G_DEFINE_TYPE_WITH_CODE (EekXkbLayout, eek_xkb_layout, EEK_TYPE_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XKB_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutPrivate))
+
 enum {
    PROP_0,
    PROP_DISPLAY,
    PROP_LAST
 };

-typedef struct _EekXkbLayoutPrivate
+struct _EekXkbLayoutPrivate
 {
    /* Configuration names that should synch'ed to the symbolic names
       in priv->xkb->names.  Since we use GLib's memory allocator,
@ -75,13 +82,7 @@ typedef struct _EekXkbLayoutPrivate

    gint scale_numerator;
    gint scale_denominator;
-} EekXkbLayoutPrivate;
-
-G_DEFINE_TYPE_EXTENDED (EekXkbLayout, eek_xkb_layout, EEK_TYPE_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE(EekXkbLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
+};

 static guint    find_keycode             (EekXkbLayout *layout,
                                          gchar        *key_name);
@ -100,7 +101,7 @@ G_INLINE_FUNC gint
 xkb_to_pixmap_coord (EekXkbLayout *layout,
                     gint          n)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
    return n * priv->scale_numerator / priv->scale_denominator;
 }

@ -108,7 +109,7 @@ G_INLINE_FUNC gdouble
 xkb_to_pixmap_double (EekXkbLayout *layout,
                     gdouble       d)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
    return d * priv->scale_numerator / priv->scale_denominator;
 }

@ -126,7 +127,7 @@ create_key (EekXkbLayout *layout,
    XkbBoundsRec *xkbbounds;
    XkbShapeRec *xkbshape;
    XkbOutlineRec *xkboutline;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
    EekKey *key;
    EekBounds bounds;
    EekSymbolMatrix *matrix = NULL;
@ -236,7 +237,7 @@ create_section (EekXkbLayout  *layout,
                XkbSectionRec *xkbsection)
 {
    XkbGeometryRec *xkbgeometry;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv;
    EekSection *section;
    EekBounds bounds;
    gchar *name;
@ -248,6 +249,7 @@ create_section (EekXkbLayout  *layout,
    bounds.width = xkb_to_pixmap_coord(layout, xkbsection->width);
    bounds.height = xkb_to_pixmap_coord(layout, xkbsection->height);

+    priv = layout->priv;
    xkbgeometry = priv->xkb->geom;
    section = eek_keyboard_create_section (keyboard);
    name = XGetAtomName (priv->display, xkbsection->name);
@ -291,7 +293,7 @@ create_section (EekXkbLayout  *layout,
 static void
 create_keyboard (EekXkbLayout *layout, EekKeyboard *keyboard)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
    XkbGeometryRec *xkbgeometry;
    EekBounds bounds;
    gint i;
@ -335,8 +337,7 @@ eek_xkb_layout_real_create_keyboard (EekboardContextService *manager,
    eek_element_set_bounds (EEK_ELEMENT(keyboard), &bounds);

    /* resolve modifiers dynamically assigned at run time */
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (
-		    EEK_XKB_LAYOUT(self));
+    EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (self);
    eek_keyboard_set_num_lock_mask (keyboard,
                                    XkbKeysymToModifiers (priv->display,
                                                          XK_Num_Lock));
@ -357,8 +358,7 @@ eek_xkb_layout_real_create_keyboard (EekboardContextService *manager,
 static void
 eek_xkb_layout_finalize (GObject *object)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (
-		    EEK_XKB_LAYOUT (object));
+    EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (object);

    g_free (priv->names.keycodes);
    g_free (priv->names.geometry);
@ -374,11 +374,10 @@ eek_xkb_layout_set_property (GObject      *object,
                             GParamSpec   *pspec)
 {
    EekXkbLayout *layout = EEK_XKB_LAYOUT (object);
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);

    switch (prop_id) {
    case PROP_DISPLAY:
-        priv->display = g_value_get_pointer (value);
+        layout->priv->display = g_value_get_pointer (value);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -393,11 +392,10 @@ eek_xkb_layout_get_property (GObject    *object,
                             GParamSpec *pspec)
 {
    EekXkbLayout *layout = EEK_XKB_LAYOUT (object);
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);

    switch (prop_id) {
    case PROP_DISPLAY:
-        g_value_set_pointer (value, priv->display);
+        g_value_set_pointer (value, layout->priv->display);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -412,6 +410,8 @@ eek_xkb_layout_class_init (EekXkbLayoutClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekXkbLayoutPrivate));
+
    layout_class->create_keyboard = eek_xkb_layout_real_create_keyboard;

    gobject_class->finalize = eek_xkb_layout_finalize;
@ -429,14 +429,14 @@ eek_xkb_layout_class_init (EekXkbLayoutClass *klass)
 static void
 eek_xkb_layout_init (EekXkbLayout *self)
 {
-    /* void */
+    self->priv = EEK_XKB_LAYOUT_GET_PRIVATE (self);
 }

 static gboolean
 get_names_from_server (EekXkbLayout *layout,
                       GError      **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
    gchar *name;

    XkbGetNames (priv->display, XkbAllNamesMask, priv->xkb);
@ -516,21 +516,19 @@ eek_xkb_layout_set_names (EekXkbLayout         *layout,
                          XkbComponentNamesRec *names,
                          GError              **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
-
-    if (g_strcmp0 (names->keycodes, priv->names.keycodes)) {
-        g_free (priv->names.keycodes);
-        priv->names.keycodes = g_strdup (names->keycodes);
+    if (g_strcmp0 (names->keycodes, layout->priv->names.keycodes)) {
+        g_free (layout->priv->names.keycodes);
+        layout->priv->names.keycodes = g_strdup (names->keycodes);
    }

-    if (g_strcmp0 (names->geometry, priv->names.geometry)) {
-        g_free (priv->names.geometry);
-        priv->names.geometry = g_strdup (names->geometry);
+    if (g_strcmp0 (names->geometry, layout->priv->names.geometry)) {
+        g_free (layout->priv->names.geometry);
+        layout->priv->names.geometry = g_strdup (names->geometry);
    }

-    if (g_strcmp0 (names->symbols, priv->names.symbols)) {
-        g_free (priv->names.symbols);
-        priv->names.symbols = g_strdup (names->symbols);
+    if (g_strcmp0 (names->symbols, layout->priv->names.symbols)) {
+        g_free (layout->priv->names.symbols);
+        layout->priv->names.symbols = g_strdup (names->symbols);
    }

    return get_keyboard_from_server (layout, error);
@ -540,7 +538,7 @@ static gboolean
 get_keyboard_from_server (EekXkbLayout *layout,
                          GError      **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;

    if (priv->xkb) {
        XkbFreeKeyboard (priv->xkb, 0, True);
@ -591,7 +589,7 @@ find_keycode (EekXkbLayout *layout, gchar *key_name)
    XkbKeyAliasPtr palias;
    guint is_name_matched;
    gchar *src, *dst;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;

    if (!priv->xkb)
        return EEK_INVALID_KEYCODE;
@ -644,7 +642,7 @@ setup_scaling (EekXkbLayout *layout,
               gdouble       width,
               gdouble       height)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;

    g_return_if_fail (priv->xkb);

--- a/eek/eek-xkb-layout.h
+++ b/eek/eek-xkb-layout.h
@ -31,7 +31,23 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_XKB_LAYOUT (eek_xkb_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXkbLayout, eek_xkb_layout, EEK, XKB_LAYOUT, EekLayout)
+#define EEK_XKB_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayout))
+#define EEK_XKB_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutClass))
+#define EEK_IS_XKB_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XKB_LAYOUT))
+#define EEK_IS_XKB_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XKB_LAYOUT))
+#define EEK_XKB_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutClass))
+
+typedef struct _EekXkbLayout        EekXkbLayout;
+typedef struct _EekXkbLayoutClass   EekXkbLayoutClass;
+typedef struct _EekXkbLayoutPrivate EekXkbLayoutPrivate;
+
+struct _EekXkbLayout
+{
+    /*< private >*/
+    EekLayout parent;
+
+    EekXkbLayoutPrivate *priv;
+};

 struct _EekXkbLayoutClass
 {
--- a/eek/eek-xkl-layout.c
+++ b/eek/eek-xkl-layout.c
@ -42,6 +42,13 @@ static GInitableIface *parent_initable_iface;

 static void initable_iface_init (GInitableIface *initable_iface);

+G_DEFINE_TYPE_WITH_CODE (EekXklLayout, eek_xkl_layout, EEK_TYPE_XKB_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XKL_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayoutPrivate))
+
 enum {
    PROP_0,
    PROP_MODEL,
@ -51,17 +58,11 @@ enum {
    PROP_LAST
 };

-typedef struct _EekXklLayoutPrivate
+struct _EekXklLayoutPrivate
 {
    XklEngine *engine;
    XklConfigRec *config;
-} EekXklLayoutPrivate;
-
-G_DEFINE_TYPE_EXTENDED (EekXklLayout, eek_xkl_layout, EEK_TYPE_XKB_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE (EekXklLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
+};

 /* from gnome-keyboard-properties-xkbpv.c:
 *  BAD STYLE: Taken from xklavier_private_xkb.h
@ -82,8 +83,7 @@ static gboolean set_xkb_component_names (EekXklLayout *layout,
 static void
 eek_xkl_layout_dispose (GObject *object)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (
-		    EEK_XKL_LAYOUT (object));
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (object);

    if (priv->config) {
        g_object_unref (priv->config);
@ -157,6 +157,8 @@ eek_xkl_layout_class_init (EekXklLayoutClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekXklLayoutPrivate));
+
    gobject_class->dispose = eek_xkl_layout_dispose;
    gobject_class->set_property = eek_xkl_layout_set_property;
    gobject_class->get_property = eek_xkl_layout_get_property;
@ -213,7 +215,7 @@ eek_xkl_layout_class_init (EekXklLayoutClass *klass)
 static void
 eek_xkl_layout_init (EekXklLayout *self)
 {
-    /* void */
+    self->priv = EEK_XKL_LAYOUT_GET_PRIVATE (self);
 }

 /**
@ -264,7 +266,7 @@ gboolean
 eek_xkl_layout_set_config (EekXklLayout *layout,
                           XklConfigRec *config)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
    XklConfigRec *c;
    gboolean retval;

@ -327,7 +329,7 @@ gboolean
 eek_xkl_layout_set_model (EekXklLayout *layout,
                          const gchar  *model)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
    XklConfigRec *config;
    gboolean retval;
    
@ -355,7 +357,7 @@ gboolean
 eek_xkl_layout_set_layouts (EekXklLayout *layout,
                            gchar       **layouts)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
    XklConfigRec *config;
    gboolean retval;

@ -383,7 +385,7 @@ gboolean
 eek_xkl_layout_set_variants (EekXklLayout *layout,
                             gchar       **variants)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
    XklConfigRec *config;
    gboolean retval;

@ -411,7 +413,7 @@ gboolean
 eek_xkl_layout_set_options (EekXklLayout *layout,
                            gchar       **options)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
    XklConfigRec *config;
    gboolean retval;

@ -495,7 +497,7 @@ eek_xkl_layout_disable_option (EekXklLayout *layout,
 gchar *
 eek_xkl_layout_get_model (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);

    g_return_val_if_fail (priv, NULL);
    return g_strdup (priv->config->model);
@ -511,7 +513,7 @@ eek_xkl_layout_get_model (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_layouts (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);

    g_return_val_if_fail (priv, NULL);
    return g_strdupv (priv->config->layouts);
@ -527,7 +529,7 @@ eek_xkl_layout_get_layouts (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_variants (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);

    g_return_val_if_fail (priv, NULL);
    return g_strdupv (priv->config->variants);
@ -543,7 +545,7 @@ eek_xkl_layout_get_variants (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_options (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);

    g_return_val_if_fail (priv, NULL);
    return g_strdupv (priv->config->options);
@ -552,7 +554,7 @@ eek_xkl_layout_get_options (EekXklLayout *layout)
 static gboolean
 set_xkb_component_names (EekXklLayout *layout, XklConfigRec *config)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = layout->priv;
    XkbComponentNamesRec names;
    gboolean retval = FALSE;

@ -626,22 +628,21 @@ initable_init (GInitable    *initable,
               GError      **error)
 {
    EekXklLayout *layout = EEK_XKL_LAYOUT (initable);
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
    Display *display;

    if (!parent_initable_iface->init (initable, cancellable, error))
        return FALSE;

-    priv->config = xkl_config_rec_new ();
+    layout->priv->config = xkl_config_rec_new ();

    g_object_get (G_OBJECT (initable),
                  "display", &display,
                  NULL);

-    priv->engine = xkl_engine_get_instance (display);
+    layout->priv->engine = xkl_engine_get_instance (display);

-    if (!xkl_config_rec_get_from_server (priv->config,
-                                         priv->engine)) {
+    if (!xkl_config_rec_get_from_server (layout->priv->config,
+                                         layout->priv->engine)) {
        g_set_error (error,
                     EEK_ERROR,
                     EEK_ERROR_LAYOUT_ERROR,
@ -649,7 +650,7 @@ initable_init (GInitable    *initable,
        return FALSE;
    }

-    set_xkb_component_names (layout, priv->config);
+    set_xkb_component_names (layout, layout->priv->config);
    return TRUE;
 }

--- a/eek/eek-xkl-layout.h
+++ b/eek/eek-xkl-layout.h
@ -31,7 +31,23 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_XKL_LAYOUT (eek_xkl_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXklLayout, eek_xkl_layout, EEK, XKL_LAYOUT, EekLayout)
+#define EEK_XKL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayout))
+#define EEK_XKL_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XKL_LAYOUT, EekXklLayoutClass))
+#define EEK_IS_XKL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XKL_LAYOUT))
+#define EEK_IS_XKL_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XKL_LAYOUT))
+#define EEK_XKL_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayoutClass))
+
+typedef struct _EekXklLayout        EekXklLayout;
+typedef struct _EekXklLayoutClass   EekXklLayoutClass;
+typedef struct _EekXklLayoutPrivate EekXklLayoutPrivate;
+
+struct _EekXklLayout
+{
+    /*< private >*/
+    EekXkbLayout parent;
+
+    EekXklLayoutPrivate *priv;
+};

 struct _EekXklLayoutClass
 {
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -1,7 +1,7 @@
-/*
+/* 
 * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2011 Red Hat, Inc.
- *
+ * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@ -25,7 +25,6 @@
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */

-#include <gio/gio.h> /* GResource */
 #include <stdlib.h>
 #include <string.h>

@ -36,8 +35,6 @@
 #include "eek-keysym.h"
 #include "eek-text.h"

-#include "squeekboard-resources.h"
-
 enum {
    PROP_0,
    PROP_ID,
@ -46,18 +43,19 @@ enum {

 static void initable_iface_init (GInitableIface *initable_iface);

-typedef struct _EekXmlLayoutPrivate
+G_DEFINE_TYPE_WITH_CODE (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XML_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayoutPrivate))
+
+struct _EekXmlLayoutPrivate
 {
    gchar *id;
    gchar *keyboards_dir;
    EekXmlKeyboardDesc *desc;
-} EekXmlLayoutPrivate;
-
-G_DEFINE_TYPE_EXTENDED (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE(EekXmlLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
+};

 G_DEFINE_BOXED_TYPE(EekXmlKeyboardDesc, eek_xml_keyboard_desc, eek_xml_keyboard_desc_copy, eek_xml_keyboard_desc_free);

@ -249,7 +247,6 @@ struct _GeometryParseData {
    gchar *name;
    EekOutline outline;
    gchar *oref;
-    gint keycode;

    GHashTable *key_oref_hash;
    GHashTable *oref_outline_hash;
@ -272,7 +269,6 @@ geometry_parse_data_new (EekKeyboard *keyboard)
                               g_str_equal,
                               g_free,
                               (GDestroyNotify)eek_outline_free);
-    data->keycode = 1;
    return data;
 }

@ -364,6 +360,8 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,

        if (g_strcmp0 (data->element_stack->data, "geometry") == 0)
            eek_element_set_bounds (EEK_ELEMENT(data->keyboard), &bounds);
+        else if (g_strcmp0 (data->element_stack->data, "section") == 0)
+            eek_element_set_bounds (EEK_ELEMENT(data->section), &bounds);
        goto out;
    }

@ -398,23 +396,29 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
    }

    if (g_strcmp0 (element_name, "key") == 0) {
+        guint keycode;

        attribute = get_attribute (attribute_names, attribute_values,
-                                   "name");
+                                   "keycode");
        if (attribute == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-                         "no \"name\" attribute for \"key\"");
+                         "no \"keycode\" attribute for \"key\"");
            return;
        }
+        keycode = strtoul (attribute, NULL, 10);

        data->key = eek_section_create_key (data->section,
-                                            g_strdup (attribute),
-                                            data->keycode++,
+                                            keycode,
                                            data->num_columns,
                                            data->num_rows - 1);

+        attribute = get_attribute (attribute_names, attribute_values,
+                                   "name");
+        if (attribute != NULL)
+            eek_element_set_name (EEK_ELEMENT(data->key), attribute);
+
        attribute = get_attribute (attribute_names, attribute_values,
                                   "oref");
        if (attribute == NULL) {
@ -448,7 +452,7 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
                                   "corner-radius");
        if (attribute != NULL)
            data->corner_radius = g_strtod (attribute, NULL);
-
+        
        goto out;
    }

@ -618,25 +622,28 @@ symbols_start_element_callback (GMarkupParseContext *pcontext,
        return;

    if (g_strcmp0 (element_name, "key") == 0) {
+        guint keycode;

        attribute = get_attribute (attribute_names, attribute_values,
-                                   "name");
+                                   "keycode");
        if (attribute == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-                         "no \"name\" attribute for \"key\"");
+                         "no \"keycode\" attribute for \"key\"");
            return;
        }
+        keycode = strtoul (attribute, NULL, 10);

-        data->key = eek_keyboard_find_key_by_name (data->keyboard,
-                                                   attribute);
-        if (data->key == NULL) {
+        data->key = eek_keyboard_find_key_by_keycode (data->keyboard,
+                                                      keycode);
+        /*if (data->key == NULL) {
            g_set_error (error,
                         G_MARKUP_ERROR,
                         G_MARKUP_ERROR_INVALID_CONTENT,
-                         "no such key %s", attribute);
-        }
+                         "no such keycode %u", keycode);
+            return;
+        }*/

        attribute = get_attribute (attribute_names, attribute_values,
                                   "groups");
@ -896,7 +903,6 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
                                     gdouble    initial_height)
 {
    EekXmlLayout *layout = EEK_XML_LAYOUT (self);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
    gboolean retval;

    /* Create an empty keyboard to which geometry and symbols
@ -905,8 +911,8 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
    keyboard->manager = manager;

    /* Read geometry information. */
-    gchar *filename = g_strdup_printf ("%s.xml", priv->desc->geometry);
-    gchar *path = g_build_filename (priv->keyboards_dir, "geometry", filename, NULL);
+    gchar *filename = g_strdup_printf ("%s.xml", layout->priv->desc->geometry);
+    gchar *path = g_build_filename (layout->priv->keyboards_dir, "geometry", filename, NULL);
    g_free (filename);

    GError *error = NULL;
@ -915,7 +921,7 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
    if (!retval) {
        g_object_unref (keyboard);
        g_warning ("can't parse geometry file %s: %s",
-                   priv->desc->geometry,
+                   layout->priv->desc->geometry,
                   error->message);
        g_error_free (error);
        return NULL;
@ -923,8 +929,8 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,

    /* Read symbols information. */
    GList *loaded = NULL;
-    retval = parse_symbols_with_prerequisites (priv->keyboards_dir,
-                                               priv->desc->symbols,
+    retval = parse_symbols_with_prerequisites (layout->priv->keyboards_dir,
+                                               layout->priv->desc->symbols,
                                               keyboard,
                                               &loaded,
                                               &error);
@ -932,7 +938,7 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
    if (!retval) {
        g_object_unref (keyboard);
        g_warning ("can't parse symbols file %s: %s",
-                   priv->desc->symbols,
+                   layout->priv->desc->symbols,
                   error->message);
        g_error_free (error);
        return NULL;
@ -955,12 +961,10 @@ eek_xml_layout_set_property (GObject      *object,
                             GParamSpec   *pspec)
 {
    EekXmlLayout *layout = EEK_XML_LAYOUT (object);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
-
    switch (prop_id) {
    case PROP_ID:
-        g_free (priv->id);
-        priv->id = g_value_dup_string (value);
+        g_free (layout->priv->id);
+        layout->priv->id = g_value_dup_string (value);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -975,11 +979,9 @@ eek_xml_layout_get_property (GObject    *object,
                             GParamSpec *pspec)
 {
    EekXmlLayout *layout = EEK_XML_LAYOUT (object);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
-
    switch (prop_id) {
    case PROP_ID:
-        g_value_set_string (value, priv->id);
+        g_value_set_string (value, layout->priv->id);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -990,8 +992,7 @@ eek_xml_layout_get_property (GObject    *object,
 static void
 eek_xml_layout_finalize (GObject *object)
 {
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (
-		    EEK_XML_LAYOUT (object));
+    EekXmlLayoutPrivate *priv = EEK_XML_LAYOUT_GET_PRIVATE (object);

    g_free (priv->id);

@ -1010,6 +1011,8 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class, sizeof (EekXmlLayoutPrivate));
+
    layout_class->create_keyboard = eek_xml_layout_real_create_keyboard;

    gobject_class->set_property = eek_xml_layout_set_property;
@ -1028,7 +1031,7 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
 static void
 eek_xml_layout_init (EekXmlLayout *self)
 {
-    /* void */
+    self->priv = EEK_XML_LAYOUT_GET_PRIVATE (self);
 }

 EekLayout *
@ -1047,17 +1050,16 @@ initable_init (GInitable    *initable,
               GError      **error)
 {
    EekXmlLayout *layout = EEK_XML_LAYOUT (initable);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
    GList *keyboards, *p;
    gchar *path;
    EekXmlKeyboardDesc *desc;

-    priv->keyboards_dir = g_strdup ((gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR"));
+    layout->priv->keyboards_dir = (gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR");
+    if (layout->priv->keyboards_dir == NULL)
+        layout->priv->keyboards_dir = KEYBOARDSDIR;
+    layout->priv->keyboards_dir = g_strdup (layout->priv->keyboards_dir);

-    if (priv->keyboards_dir == NULL)
-        priv->keyboards_dir = g_strdup ("resource:///sm/puri/squeekboard/keyboards/");
-
-    path = g_build_filename (priv->keyboards_dir, "keyboards.xml", NULL);
+    path = g_build_filename (layout->priv->keyboards_dir, "keyboards.xml", NULL);
    keyboards = parse_keyboards (path, error);
    g_free (path);
    if (error && *error)
@ -1065,7 +1067,7 @@ initable_init (GInitable    *initable,

    for (p = keyboards; p; p = p->next) {
        desc = p->data;
-        if (g_strcmp0 (desc->id, priv->id) == 0)
+        if (g_strcmp0 (desc->id, layout->priv->id) == 0)
            break;
    }
    if (p == NULL) {
@ -1073,12 +1075,12 @@ initable_init (GInitable    *initable,
                     EEK_ERROR,
                     EEK_ERROR_LAYOUT_ERROR,
                     "no such keyboard %s",
-                     priv->id);
+                     layout->priv->id);
        return FALSE;
    }

    keyboards = g_list_remove_link (keyboards, p);
-    priv->desc = p->data;
+    layout->priv->desc = p->data;
    g_list_free_1 (p);
    g_list_free_full (keyboards, (GDestroyNotify) keyboard_desc_free);

@ -1106,7 +1108,7 @@ eek_xml_list_keyboards (void)

    keyboards_dir = g_getenv ("EEKBOARD_KEYBOARDSDIR");
    if (keyboards_dir == NULL)
-        keyboards_dir = g_strdup ("resource:///sm/puri/squeekboard/keyboards/");
+        keyboards_dir = KEYBOARDSDIR;
    path = g_build_filename (keyboards_dir, "keyboards.xml", NULL);
    keyboards = parse_keyboards (path, NULL);
    g_free (path);
@ -1175,9 +1177,7 @@ parse_geometry (const gchar *path, EekKeyboard *keyboard, GError **error)
    GFileInputStream *input;
    gboolean retval;

-    file = g_str_has_prefix (path, "resource://")
-         ? g_file_new_for_uri  (path)
-         : g_file_new_for_path (path);
+    file = g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1303,9 +1303,7 @@ parse_symbols (const gchar *path, EekKeyboard *keyboard, GError **error)
    GFileInputStream *input;
    gboolean retval;

-    file = g_str_has_prefix (path, "resource://")
-         ? g_file_new_for_uri  (path)
-         : g_file_new_for_path (path);
+    file = g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1338,9 +1336,7 @@ parse_prerequisites (const gchar *path, GError **error)
    GList *prerequisites;
    gboolean retval;

-    file = g_str_has_prefix (path, "resource://")
-         ? g_file_new_for_uri  (path)
-         : g_file_new_for_path (path);
+    file = g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1375,9 +1371,7 @@ parse_keyboards (const gchar *path, GError **error)
    GList *keyboards;
    gboolean retval;

-    file = g_str_has_prefix (path, "resource://")
-         ? g_file_new_for_uri  (path)
-         : g_file_new_for_path (path);
+    file = g_file_new_for_path (path);

    input = g_file_read (file, NULL, error);
    g_object_unref (file);
@ -1454,7 +1448,7 @@ static void scale_keyboard (EekKeyboard *keyboard,
    for (i = 0; i < n_outlines; i++) {
        EekOutline *outline = eek_keyboard_get_outline (keyboard, i);
        gint j;
-
+ 
        for (j = 0; j < outline->num_points; j++) {
            outline->points[j].x *= scale;
            outline->points[j].y *= scale;
--- a/eek/eek-xml-layout.h
+++ b/eek/eek-xml-layout.h
@ -29,7 +29,29 @@
 G_BEGIN_DECLS

 #define EEK_TYPE_XML_LAYOUT (eek_xml_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXmlLayout, eek_xml_layout, EEK, XML_LAYOUT, EekLayout)
+#define EEK_XML_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayout))
+#define EEK_XML_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XML_LAYOUT, EekXmlLayoutClass))
+#define EEK_IS_XML_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XML_LAYOUT))
+#define EEK_IS_XML_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XML_LAYOUT))
+#define EEK_XML_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayoutClass))
+
+typedef struct _EekXmlLayout        EekXmlLayout;
+typedef struct _EekXmlLayoutClass   EekXmlLayoutClass;
+typedef struct _EekXmlLayoutPrivate EekXmlLayoutPrivate;
+
+/**
+ * EekXmlLayout:
+ *
+ * The #EekXmlLayout structure contains only private data and should
+ * only be accessed using the provided API.
+ */
+struct _EekXmlLayout
+{
+    /*< private >*/
+    EekLayout parent;
+
+    EekXmlLayoutPrivate *priv;
+};

 /**
 * EekXmlLayoutClass:
--- a/eek/eek.c
+++ b/eek/eek.c
@ -38,5 +38,9 @@
 void
 eek_init (void)
 {
-    /* void */
+    g_type_init ();
+
+    g_type_class_ref (EEK_TYPE_SYMBOL);
+    g_type_class_ref (EEK_TYPE_KEYSYM);
+    g_type_class_ref (EEK_TYPE_TEXT);
 }
--- a/eekboard/eekboard-client.c
+++ b/eekboard/eekboard-client.c
@ -36,12 +36,15 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-typedef struct _EekboardClientPrivate
+G_DEFINE_TYPE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY);
+
+#define EEKBOARD_CLIENT_GET_PRIVATE(obj)                                \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientPrivate))
+
+struct _EekboardClientPrivate
 {
    GHashTable *context_hash;
-} EekboardClientPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY)
+};

 static void send_destroy_context (EekboardClient  *client,
                                  EekboardContext *context,
@ -50,7 +53,7 @@ static void send_destroy_context (EekboardClient  *client,
 static void
 eekboard_client_real_destroyed (EekboardClient *self)
 {
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (self);
+    EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(self);

    // g_debug ("eekboard_client_real_destroyed");
    g_hash_table_remove_all (priv->context_hash);
@ -60,7 +63,7 @@ static void
 eekboard_client_dispose (GObject *object)
 {
    EekboardClient *client = EEKBOARD_CLIENT(object);
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
+    EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(client);

    if (priv->context_hash) {
        GHashTableIter iter;
@ -83,6 +86,9 @@ eekboard_client_class_init (EekboardClientClass *klass)
 {
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardClientPrivate));
+
    klass->destroyed = eekboard_client_real_destroyed;

    gobject_class->dispose = eekboard_client_dispose;
@ -109,9 +115,8 @@ eekboard_client_class_init (EekboardClientClass *klass)
 static void
 eekboard_client_init (EekboardClient *self)
 {
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (self);
-
-    priv->context_hash =
+    self->priv = EEKBOARD_CLIENT_GET_PRIVATE(self);
+    self->priv->context_hash =
        g_hash_table_new_full (g_str_hash,
                               g_str_equal,
                               (GDestroyNotify)g_free,
@ -184,9 +189,7 @@ on_context_destroyed (EekboardContext *context,
                      gpointer         user_data)
 {
    EekboardClient *client = user_data;
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
-    g_hash_table_remove (priv->context_hash,
+    g_hash_table_remove (client->priv->context_hash,
                         g_dbus_proxy_get_object_path (G_DBUS_PROXY(context)));
 }

@ -236,9 +239,7 @@ eekboard_client_create_context (EekboardClient *client,
        return NULL;
    }

-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
-    g_hash_table_insert (priv->context_hash,
+    g_hash_table_insert (client->priv->context_hash,
                         g_strdup (object_path),
                         g_object_ref (context));
    g_signal_connect (context, "destroyed",
@ -283,11 +284,9 @@ eekboard_client_push_context (EekboardClient  *client,
    g_return_if_fail (EEKBOARD_IS_CLIENT(client));
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
    object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));

-    context = g_hash_table_lookup (priv->context_hash,
+    context = g_hash_table_lookup (client->priv->context_hash,
                                   object_path);
    if (!context)
        return;
@ -395,10 +394,8 @@ eekboard_client_destroy_context (EekboardClient  *client,
    g_return_if_fail (EEKBOARD_IS_CLIENT(client));
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
    object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));
-    g_hash_table_remove (priv->context_hash, object_path);
+    g_hash_table_remove (client->priv->context_hash, object_path);

    send_destroy_context (client, context, cancellable);
 }
--- a/eekboard/eekboard-client.h
+++ b/eekboard/eekboard-client.h
@ -26,7 +26,22 @@
 G_BEGIN_DECLS

 #define EEKBOARD_TYPE_CLIENT (eekboard_client_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardClient, eekboard_client, EEKBOARD, CLIENT, GDBusProxy)
+#define EEKBOARD_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CLIENT, EekboardClient))
+#define EEKBOARD_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
+#define EEKBOARD_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CLIENT))
+#define EEKBOARD_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CLIENT))
+#define EEKBOARD_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
+
+typedef struct _EekboardClient EekboardClient;
+typedef struct _EekboardClientClass EekboardClientClass;
+typedef struct _EekboardClientPrivate EekboardClientPrivate;
+
+struct _EekboardClient {
+    /*< private >*/
+    GDBusProxy parent;
+
+    EekboardClientPrivate *priv;
+};

 struct _EekboardClientClass {
    /*< private >*/
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -1,7 +1,7 @@
-/*
+/* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
- *
+ * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@ -82,9 +82,9 @@ struct _EekboardContextServicePrivate {
    GSettings *settings;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);

-/*static Display *display = NULL; */
+static Display *display = NULL;

 static EekKeyboard *
 eekboard_context_service_real_create_keyboard (EekboardContextService *self,
@ -150,14 +150,13 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
    rules.layout = strdup(keyboard_type);
    struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &rules,
        XKB_KEYMAP_COMPILE_NO_FLAGS);
-    xkb_context_unref(context);
    if (!keymap) {
        g_error("Bad keymap");
    }
    keyboard->keymap = keymap;
    char *keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
    keyboard->keymap_len = strlen(keymap_str) + 1;
-    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
+    char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
    getrandom(r, 6, GRND_NONBLOCK);
    for (uint i = 0; i < 6; i++) {
@ -285,7 +284,6 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
        }
    }
    g_variant_iter_free(iter);
-    g_variant_unref(inputs);
 }

 static void
@ -358,6 +356,9 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardContextServicePrivate));
+
    klass->create_keyboard = eekboard_context_service_real_create_keyboard;
    klass->show_keyboard = eekboard_context_service_real_show_keyboard;
    klass->hide_keyboard = eekboard_context_service_real_hide_keyboard;
@ -482,6 +483,51 @@ eekboard_context_service_init (EekboardContextService *self)
    }
 }

+static gboolean on_repeat_timeout (EekboardContextService *context);
+
+static gboolean
+on_repeat_timeout (EekboardContextService *context)
+{
+    guint delay = 500; // ms
+
+    // hardcoding; needs to connect to yet another settings path because
+    // org.gnome.desktop.input-sources doesn't control repeating
+    //g_settings_get (context->priv->settings, "repeat-interval", "u", &delay);
+
+    context->priv->repeat_timeout_id =
+        g_timeout_add (delay,
+                       (GSourceFunc)on_repeat_timeout,
+                       context);
+
+    return FALSE;
+}
+
+static gboolean
+on_repeat_timeout_init (EekboardContextService *context)
+{
+    /* FIXME: clear modifiers for further key repeat; better not
+       depend on modifier behavior is LATCH */
+    eek_keyboard_set_modifiers (context->priv->keyboard, 0);
+    
+    /* reschedule repeat timeout only when "repeat" option is set */
+    /* TODO: org.gnome.desktop.input-sources doesn't have repeat info.
+     * In addition, repeat is only useful when the keyboard is not in text
+     * input mode */
+    /*
+    if (g_settings_get_boolean (context->priv->settings, "repeat")) {
+        guint delay;
+
+        g_settings_get (context->priv->settings, "repeat-interval", "u", &delay);
+        context->priv->repeat_timeout_id =
+            g_timeout_add (delay,
+                           (GSourceFunc)on_repeat_timeout,
+                           context);
+    } else */
+        context->priv->repeat_timeout_id = 0;
+
+    return FALSE;
+}
+
 /**
 * eekboard_context_service_enable:
 * @context: an #EekboardContextService
@ -523,9 +569,7 @@ eekboard_context_service_show_keyboard (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));

-    if (!context->priv->visible) {
-        EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context);
-    }
+    EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context);
 }

 void
@ -533,9 +577,7 @@ eekboard_context_service_hide_keyboard (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));

-    if (context->priv->visible) {
-        EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context);
-    }
+    EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context);
 }

 /**
--- a/eekboard/eekboard-context.c
+++ b/eekboard/eekboard-context.c
@ -49,15 +49,18 @@ enum {
    PROP_LAST
 };

-typedef struct _EekboardContextPrivate
+G_DEFINE_TYPE (EekboardContext, eekboard_context, G_TYPE_DBUS_PROXY);
+
+#define EEKBOARD_CONTEXT_GET_PRIVATE(obj)                               \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContextPrivate))
+
+struct _EekboardContextPrivate
 {
    gboolean visible;
    gboolean enabled;
    gboolean fullscreen;
    gint group;
-} EekboardContextPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardContext, eekboard_context, G_TYPE_DBUS_PROXY)
+};

 static void
 eekboard_context_real_g_signal (GDBusProxy  *self,
@ -66,7 +69,6 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
                                GVariant    *parameters)
 {
    EekboardContext *context = EEKBOARD_CONTEXT (self);
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);

    if (g_strcmp0 (signal_name, "Enabled") == 0) {
        g_signal_emit (context, signals[ENABLED], 0);
@ -109,8 +111,8 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
        gboolean visible = FALSE;

        g_variant_get (parameters, "(b)", &visible);
-        if (visible != priv->visible) {
-            priv->visible = visible;
+        if (visible != context->priv->visible) {
+            context->priv->visible = visible;
            g_object_notify (G_OBJECT(context), "visible");
        }
        return;
@ -120,8 +122,8 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
        gint group = 0;

        g_variant_get (parameters, "(i)", &group);
-        if (group != priv->group) {
-            priv->group = group;
+        if (group != context->priv->group) {
+            context->priv->group = group;
            /* g_object_notify (G_OBJECT(context), "group"); */
        }
        return;
@ -133,17 +135,13 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
 static void
 eekboard_context_real_enabled (EekboardContext *self)
 {
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (self);
-
-    priv->enabled = TRUE;
+    self->priv->enabled = TRUE;
 }

 static void
 eekboard_context_real_disabled (EekboardContext *self)
 {
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (self);
-
-    priv->enabled = FALSE;
+    self->priv->enabled = FALSE;
 }

 static void
@ -166,11 +164,9 @@ eekboard_context_get_property (GObject    *object,
                               GParamSpec *pspec)
 {
    EekboardContext *context = EEKBOARD_CONTEXT(object);
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
    switch (prop_id) {
    case PROP_VISIBLE:
-        g_value_set_boolean (value, priv->visible);
+        g_value_set_boolean (value, context->priv->visible);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -185,6 +181,9 @@ eekboard_context_class_init (EekboardContextClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardContextPrivate));
+
    klass->enabled = eekboard_context_real_enabled;
    klass->disabled = eekboard_context_real_disabled;
    klass->destroyed = eekboard_context_real_destroyed;
@ -289,7 +288,7 @@ eekboard_context_class_init (EekboardContextClass *klass)
 static void
 eekboard_context_init (EekboardContext *self)
 {
-    /* void */
+    self->priv = EEKBOARD_CONTEXT_GET_PRIVATE(self);
 }

 static void
@ -486,9 +485,7 @@ eekboard_context_set_group (EekboardContext *context,
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->group != group) {
+    if (context->priv->group != group) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "SetGroup",
                           g_variant_new ("(i)", group),
@ -512,10 +509,7 @@ eekboard_context_get_group (EekboardContext *context,
                            GCancellable    *cancellable)
 {
    g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), 0);
-
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->group;
+    return context->priv->group;
 }

 /**
@ -532,9 +526,7 @@ eekboard_context_show_keyboard (EekboardContext *context,
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->enabled) {
+    if (context->priv->enabled) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "ShowKeyboard",
                           NULL,
@ -559,9 +551,7 @@ eekboard_context_hide_keyboard (EekboardContext *context,
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->enabled) {
+    if (context->priv->enabled) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "HideKeyboard",
                           NULL,
@ -588,9 +578,7 @@ eekboard_context_press_keycode (EekboardContext *context,
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->enabled) {
+    if (context->priv->enabled) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "PressKeycode",
                           g_variant_new ("(u)", keycode),
@ -617,9 +605,7 @@ eekboard_context_release_keycode (EekboardContext *context,
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));

-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->enabled) {
+    if (context->priv->enabled) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "ReleaseKeycode",
                           g_variant_new ("(u)", keycode),
@ -641,10 +627,7 @@ gboolean
 eekboard_context_is_visible (EekboardContext *context)
 {
    g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), FALSE);
-
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->enabled && priv->visible;
+    return context->priv->enabled && context->priv->visible;
 }

 /**
@ -661,10 +644,7 @@ eekboard_context_set_enabled (EekboardContext *context,
                              gboolean         enabled)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
-
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    priv->enabled = enabled;
+    context->priv->enabled = enabled;
 }

 /**
@ -677,10 +657,7 @@ gboolean
 eekboard_context_is_enabled (EekboardContext *context)
 {
    g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), FALSE);
-
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->enabled;
+    return context->priv->enabled;
 }

 /**
@ -697,10 +674,7 @@ eekboard_context_set_fullscreen (EekboardContext *context,
                                 GCancellable    *cancellable)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
-
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->fullscreen != fullscreen) {
+    if (context->priv->fullscreen != fullscreen) {
        g_dbus_proxy_call (G_DBUS_PROXY(context),
                           "SetFullscreen",
                           g_variant_new ("(b)", fullscreen),
--- a/eekboard/eekboard-context.h
+++ b/eekboard/eekboard-context.h
@ -28,7 +28,28 @@
 G_BEGIN_DECLS

 #define EEKBOARD_TYPE_CONTEXT (eekboard_context_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardContext, eekboard_context, EEKBOARD, CONTEXT, GDBusProxy)
+#define EEKBOARD_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContext))
+#define EEKBOARD_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CONTEXT, EekboardContextClass))
+#define EEKBOARD_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CONTEXT))
+#define EEKBOARD_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CONTEXT))
+#define EEKBOARD_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContextClass))
+
+typedef struct _EekboardContext EekboardContext;
+typedef struct _EekboardContextClass EekboardContextClass;
+typedef struct _EekboardContextPrivate EekboardContextPrivate;
+
+/**
+ * EekboardContext:
+ *
+ * The #EekboardContext structure contains only private data and
+ * should only be accessed using the provided API.
+ */
+struct _EekboardContext {
+    /*< private >*/
+    GDBusProxy parent;
+
+    EekboardContextPrivate *priv;
+};

 /**
 * EekboardContextClass:
--- a/eekboard/eekboard-service.c
+++ b/eekboard/eekboard-service.c
@ -50,8 +50,10 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-typedef struct _EekboardServicePrivate
-{
+#define EEKBOARD_SERVICE_GET_PRIVATE(obj)                               \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_SERVICE, EekboardServicePrivate))
+
+struct _EekboardServicePrivate {
    GDBusConnection *connection;
    SmPuriOSK0 *dbus_interface;
    GDBusNodeInfo *introspection_data;
@ -59,9 +61,9 @@ typedef struct _EekboardServicePrivate
    char *object_path;

    EekboardContextService *context; // unowned reference
-} EekboardServicePrivate;
+};

-G_DEFINE_TYPE_WITH_PRIVATE (EekboardService, eekboard_service, G_TYPE_OBJECT)
+G_DEFINE_TYPE (EekboardService, eekboard_service, G_TYPE_OBJECT);

 static void
 eekboard_service_set_property (GObject      *object,
@ -70,20 +72,19 @@ eekboard_service_set_property (GObject      *object,
                               GParamSpec   *pspec)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
    GDBusConnection *connection;

    switch (prop_id) {
    case PROP_OBJECT_PATH:
-        if (priv->object_path)
-            g_free (priv->object_path);
-        priv->object_path = g_value_dup_string (value);
+        if (service->priv->object_path)
+            g_free (service->priv->object_path);
+        service->priv->object_path = g_value_dup_string (value);
        break;
    case PROP_CONNECTION:
        connection = g_value_get_object (value);
-        if (priv->connection)
-            g_object_unref (priv->connection);
-        priv->connection = g_object_ref (connection);
+        if (service->priv->connection)
+            g_object_unref (service->priv->connection);
+        service->priv->connection = g_object_ref (connection);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -98,14 +99,13 @@ eekboard_service_get_property (GObject    *object,
                               GParamSpec *pspec)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);

    switch (prop_id) {
    case PROP_OBJECT_PATH:
-        g_value_set_string (value, priv->object_path);
+        g_value_set_string (value, service->priv->object_path);
        break;
    case PROP_CONNECTION:
-        g_value_set_object (value, priv->connection);
+        g_value_set_object (value, service->priv->connection);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -117,22 +117,20 @@ static void
 eekboard_service_dispose (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
-
-    if (priv->connection) {
-        if (priv->registration_id > 0) {
-            g_dbus_connection_unregister_object (priv->connection,
-                                                 priv->registration_id);
-            priv->registration_id = 0;
+    if (service->priv->connection) {
+        if (service->priv->registration_id > 0) {
+            g_dbus_connection_unregister_object (service->priv->connection,
+                                                 service->priv->registration_id);
+            service->priv->registration_id = 0;
        }

-        g_object_unref (priv->connection);
-        priv->connection = NULL;
+        g_object_unref (service->priv->connection);
+        service->priv->connection = NULL;
    }

-    if (priv->introspection_data) {
-        g_dbus_node_info_unref (priv->introspection_data);
-        priv->introspection_data = NULL;
+    if (service->priv->introspection_data) {
+        g_dbus_node_info_unref (service->priv->introspection_data);
+        service->priv->introspection_data = NULL;
    }

    G_OBJECT_CLASS (eekboard_service_parent_class)->dispose (object);
@ -142,9 +140,8 @@ static void
 eekboard_service_finalize (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);

-    g_free (priv->object_path);
+    g_free (service->priv->object_path);

    G_OBJECT_CLASS (eekboard_service_parent_class)->finalize (object);
 }
@ -153,13 +150,11 @@ static gboolean
 handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
                   gboolean arg_visible, gpointer user_data) {
    EekboardService *service = user_data;
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
-
-    if (priv->context) {
+    if (service->priv->context) {
        if (arg_visible) {
-            eekboard_context_service_show_keyboard (priv->context);
+            eekboard_context_service_show_keyboard (service->priv->context);
        } else {
-            eekboard_context_service_hide_keyboard (priv->context);
+            eekboard_context_service_hide_keyboard (service->priv->context);
        }
    }
    sm_puri_osk0_complete_set_visible(object, invocation);
@ -170,19 +165,18 @@ static void
 eekboard_service_constructed (GObject *object)
 {
    EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);

-    priv->dbus_interface = sm_puri_osk0_skeleton_new();
-    sm_puri_osk0_set_visible(priv->dbus_interface, FALSE); // TODO: use actual value
-    g_signal_connect(priv->dbus_interface, "handle-set-visible",
+    service->priv->dbus_interface = sm_puri_osk0_skeleton_new();
+    sm_puri_osk0_set_visible(service->priv->dbus_interface, FALSE); // TODO: use actual value
+    g_signal_connect(service->priv->dbus_interface, "handle-set-visible",
                     G_CALLBACK(handle_set_visible), service);

-    if (priv->connection && priv->object_path) {
+    if (service->priv->connection && service->priv->object_path) {
        GError *error = NULL;

-        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(priv->dbus_interface),
-                                              priv->connection,
-                                              priv->object_path,
+        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(service->priv->dbus_interface),
+                                              service->priv->connection,
+                                              service->priv->object_path,
                                              &error)) {
            g_warning("Error registering dbus object: %s\n", error->message);
            g_clear_error(&error);
@ -196,6 +190,9 @@ eekboard_service_class_init (EekboardServiceClass *klass)
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec *pspec;

+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardServicePrivate));
+
    klass->create_context = NULL;

    gobject_class->constructed = eekboard_service_constructed;
@ -253,9 +250,8 @@ eekboard_service_class_init (EekboardServiceClass *klass)
 static void
 eekboard_service_init (EekboardService *self)
 {
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (self);
-
-    priv->context = NULL;
+    self->priv = EEKBOARD_SERVICE_GET_PRIVATE(self);
+    self->priv->context = NULL;
 }

 /**
@ -275,9 +271,7 @@ eekboard_service_new (GDBusConnection *connection,

 void
 eekboard_service_set_context(EekboardService *service,
-                             EekboardContextService *context)
-{
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);

-    priv->context = context;
+                             EekboardContextService *context) {
+    service->priv->context = context;
 }
--- a/eekboard/eekboard-service.h
+++ b/eekboard/eekboard-service.h
@ -28,7 +28,30 @@ G_BEGIN_DECLS
 #define EEKBOARD_SERVICE_INTERFACE "sm.puri.OSK0"

 #define EEKBOARD_TYPE_SERVICE (eekboard_service_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardService, eekboard_service, EEKBOARD, SERVICE, GObject)
+#define EEKBOARD_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_SERVICE, EekboardService))
+#define EEKBOARD_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_SERVICE, EekboardServiceClass))
+#define EEKBOARD_IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_SERVICE))
+#define EEKBOARD_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_SERVICE))
+#define EEKBOARD_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_SERVICE, EekboardServiceClass))
+
+typedef struct _EekboardService EekboardService;
+typedef struct _EekboardServiceClass EekboardServiceClass;
+typedef struct _EekboardServicePrivate EekboardServicePrivate;
+
+/**
+ * EekboardService:
+ *
+ * Manages DBus interaction.
+ *
+ * The #EekboardService structure contains only private data and
+ * should only be accessed using the provided API.
+ */
+struct _EekboardService {
+    /*< private >*/
+    GObject parent;
+
+    EekboardServicePrivate *priv;
+};

 /**
 * EekboardServiceClass:
--- a/eekboard/key-emitter.c
+++ b/eekboard/key-emitter.c
@ -78,12 +78,11 @@ replace_keycode (SeatEmitter *emitter,
                 guint   keycode,
                 guint  *keysym)
 {
-/*  GdkDisplay *display = gdk_display_get_default ();
-    Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+    GdkDisplay *display = gdk_display_get_default ();
+    //Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
    guint old_keysym;
    int keysyms_per_keycode;
    KeySym *syms;
-*/
 return TRUE; // FIXME: no xkb allocated at the moment, pretending all is fine
    g_return_val_if_fail (emitter->xkb->min_key_code <= keycode &&
                          keycode <= emitter->xkb->max_key_code,
--- a/protocols/meson.build
+++ b/protocols/meson.build
@ -11,6 +11,7 @@ gen_scanner_client_code = generator(wl_scanner,

 wl_protos = [
  wl_protocol_dir + '/stable/xdg-shell/xdg-shell.xml',
+  wl_protocol_dir + '/unstable/text-input/text-input-unstable-v3.xml',
  'wlr-layer-shell-unstable-v1.xml',
  'virtual-keyboard-unstable-v1.xml',
  'input-method-unstable-v2.xml',
--- a/src/client-main.c
+++ b/src/client-main.c
@ -0,0 +1,320 @@
+/* 
+ * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
+#include <stdlib.h>
+#ifdef HAVE_ATSPI
+#include <dbus/dbus.h>
+#include <atspi/atspi.h>
+#endif  /* HAVE_ATSPI */
+#ifdef HAVE_IBUS
+#include <ibus.h>
+#endif  /* HAVE_IBUS */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "eekboard/eekboard-client.h"
+#include "client.h"
+
+static gboolean opt_system = FALSE;
+static gboolean opt_session = FALSE;
+static gchar *opt_address = NULL;
+
+static gboolean opt_focus = FALSE;
+#ifdef HAVE_ATSPI
+static gboolean opt_keystroke = FALSE;
+#endif  /* HAVE_ATSPI */
+
+static gchar *opt_keyboards = NULL;
+
+static gboolean opt_fullscreen = FALSE;
+
+static const GOptionEntry options[] = {
+    {"system", 'y', 0, G_OPTION_ARG_NONE, &opt_system,
+     N_("Connect to the system bus")},
+    {"session", 'e', 0, G_OPTION_ARG_NONE, &opt_session,
+     N_("Connect to the session bus")},
+    {"address", 'a', 0, G_OPTION_ARG_STRING, &opt_address,
+     N_("Connect to the given D-Bus address")},
+#if ENABLE_FOCUS_LISTENER
+    {"listen-focus", 'f', 0, G_OPTION_ARG_NONE, &opt_focus,
+     N_("Listen focus change events")},
+#endif  /* ENABLE_FOCUS_LISTENER */
+#ifdef HAVE_ATSPI
+    {"listen-keystroke", 's', 0, G_OPTION_ARG_NONE, &opt_keystroke,
+     N_("Listen keystroke events with AT-SPI")},
+#endif  /* HAVE_ATSPI */
+    {"keyboards", 'k', 0, G_OPTION_ARG_STRING, &opt_keyboards,
+     N_("Specify keyboards (comma separated)")},
+    {"fullscreen", 'F', 0, G_OPTION_ARG_NONE, &opt_fullscreen,
+     N_("Create window in fullscreen mode")},
+    {NULL}
+};
+
+static void
+on_context_destroyed (EekboardContext *context,
+                      gpointer         user_data)
+{
+    gtk_main_quit ();
+}
+
+static void
+on_destroyed (EekboardClient *eekboard,
+              gpointer          user_data)
+{
+    gtk_main_quit ();
+}
+
+enum FocusListenerType {
+    FOCUS_NONE,
+    FOCUS_ATSPI,
+    FOCUS_IBUS
+};
+
+static gboolean
+set_keyboards (SeatEmitter              *client,
+               const gchar * const *keyboards)
+{
+    if (g_strv_length ((gchar **)keyboards) == 0) {
+        if (!client_enable_xkl (client)) {
+            g_printerr ("Can't register xklavier event listeners\n");
+            return FALSE;
+        }
+    } else {
+        if (!client_set_keyboards (client, keyboards)) {
+            gchar *str = g_strjoinv (", ", (gchar **)keyboards);
+            g_printerr ("Can't set keyboards \"%s\"\n", str);
+            g_free (str);
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+int
+main (int argc, char **argv)
+{
+    SeatEmitter *client = NULL;
+    EekboardClient *eekboard;
+    EekboardContext *context;
+    GBusType bus_type;
+    GDBusConnection *connection;
+    GError *error;
+    GOptionContext *option_context;
+    gint focus;
+    GSettings *settings = NULL;
+    gchar **keyboards = NULL;
+    gint retval = 0;
+
+    if (!gtk_init_check (&argc, &argv)) {
+        g_printerr ("Can't init GTK\n");
+        exit (1);
+    }
+
+    eek_init ();
+
+    option_context = g_option_context_new ("eekboard-desktop-client");
+    g_option_context_add_main_entries (option_context, options, NULL);
+    g_option_context_parse (option_context, &argc, &argv, NULL);
+    g_option_context_free (option_context);
+
+    if (opt_system)
+        bus_type = G_BUS_TYPE_SYSTEM;
+    else if (opt_address)
+        bus_type = G_BUS_TYPE_NONE;
+    else
+        bus_type = G_BUS_TYPE_SESSION;
+
+    switch (bus_type) {
+    case G_BUS_TYPE_SYSTEM:
+        error = NULL;
+        connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+        if (connection == NULL) {
+            g_printerr ("Can't connect to the system bus: %s\n",
+                        error->message);
+            g_error_free (error);
+            exit (1);
+        }
+        break;
+    case G_BUS_TYPE_SESSION:
+        error = NULL;
+        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+        if (connection == NULL) {
+            g_printerr ("Can't connect to the session bus: %s\n",
+                        error->message);
+            g_error_free (error);
+            exit (1);
+        }
+        break;
+    case G_BUS_TYPE_NONE:
+        error = NULL;
+        connection = g_dbus_connection_new_for_address_sync (opt_address,
+                                                             0,
+                                                             NULL,
+                                                             NULL,
+                                                             &error);
+        if (connection == NULL) {
+            g_printerr ("Can't connect to the bus at %s: %s\n",
+                        opt_address,
+                        error->message);
+            g_error_free (error);
+            exit (1);
+        }
+        break;
+    default:
+        g_assert_not_reached ();
+        break;
+    }
+
+    client = client_new (connection);
+    g_object_unref (connection);
+
+    if (client == NULL) {
+        g_printerr ("Can't create a client\n");
+        exit (1);
+    }
+
+    settings = g_settings_new ("org.fedorahosted.eekboard");
+    focus = FOCUS_NONE;
+    if (opt_focus) {
+        gchar *focus_listener = g_settings_get_string (settings,
+                                                       "focus-listener");
+        const struct {
+            const gchar *name;
+            enum FocusListenerType type;
+        } focus_listeners[] = {
+#ifdef HAVE_ATSPI
+            { "atspi", FOCUS_ATSPI },
+#endif
+#ifdef HAVE_IBUS
+            { "ibus", FOCUS_IBUS },
+#endif
+            { NULL }
+        };
+        gint i;
+
+        focus = FOCUS_NONE;
+        for (i = 0; focus_listeners[i].name; i++) {
+            if (g_strcmp0 (focus_listener, focus_listeners[i].name) == 0)
+                focus = focus_listeners[i].type;
+        }
+        if (focus == FOCUS_NONE) {
+            g_printerr ("Unknown focus listener \"%s\".  "
+                        "Try \"atspi\" or \"ibus\"\n", focus_listener);
+            retval = 1;
+            goto out;
+        }
+    }
+        
+#ifdef HAVE_ATSPI
+    if (focus == FOCUS_ATSPI || opt_keystroke) {
+        GSettings *desktop_settings =
+            g_settings_new ("org.gnome.desktop.interface");
+        gboolean accessibility_enabled =
+            g_settings_get_boolean (desktop_settings, "toolkit-accessibility");
+        g_object_unref (desktop_settings);
+
+        if (accessibility_enabled) {
+            if (atspi_init () != 0) {
+                g_printerr ("Can't init AT-SPI 2\n");
+                retval = 1;
+                goto out;
+            }
+
+            if (focus == FOCUS_ATSPI &&
+                !client_enable_atspi_focus (client)) {
+                g_printerr ("Can't register AT-SPI focus change event listeners\n");
+                retval = 1;
+                goto out;
+            }
+
+            if (opt_keystroke &&
+                !client_enable_atspi_keystroke (client)) {
+                g_printerr ("Can't register AT-SPI keystroke event listeners\n");
+                retval = 1;
+                goto out;
+            }
+        } else {
+            g_printerr ("Desktop accessibility support is disabled\n");
+            retval = 1;
+            goto out;
+        }
+    }
+#endif  /* HAVE_ATSPI */
+
+#ifdef HAVE_IBUS
+    if (focus == FOCUS_IBUS) {
+        ibus_init ();
+
+        if (!client_enable_ibus_focus (client)) {
+            g_printerr ("Can't register IBus focus change event listeners\n");
+            retval = 1;
+            goto out;
+        }
+    }
+#endif  /* HAVE_IBUS */
+
+//#ifdef HAVE_XTEST
+    if (!client_enable_xtest (client)) {
+        g_printerr ("Can't init xtest\n");
+        g_object_unref (client);
+        exit (1);
+    }
+//#endif  /* HAVE_XTEST */
+
+    if (!opt_focus) {
+        g_object_get (client, "context", &context, NULL);
+        g_signal_connect (context, "destroyed",
+                          G_CALLBACK(on_context_destroyed), NULL);
+        g_object_unref (context);
+    }
+
+    if (opt_fullscreen ||
+        g_settings_get_boolean (settings, "start-fullscreen")) {
+        g_object_get (client, "context", &context, NULL);
+        eekboard_context_set_fullscreen (context, TRUE, NULL);
+        g_object_unref (context);
+    }
+
+    g_object_get (client, "eekboard", &eekboard, NULL);
+    g_signal_connect (eekboard, "destroyed",
+                      G_CALLBACK(on_destroyed), NULL);
+    g_object_unref (eekboard);
+    
+    if (opt_keyboards != NULL) {
+        keyboards = g_strsplit (opt_keyboards, ",", -1);
+
+        if (!set_keyboards (client, (const gchar * const *)keyboards)) {
+            g_strfreev (keyboards);
+            retval = 1;
+            goto out;
+        }
+        g_strfreev (keyboards);
+    }
+
+    gtk_main ();
+
+ out:
+    if (client)
+        g_object_unref (client);
+    if (settings)
+        g_object_unref (settings);
+
+    return retval;
+}
--- a/src/client.c
+++ b/src/client.c
--- a/src/client.h
+++ b/src/client.h
@ -0,0 +1,55 @@
+/* 
+ * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef CLIENT_H
+#define CLIENT_H 1
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_CLIENT (client_get_type())
+#define CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLIENT, Client))
+#define CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CLIENT, ClientClass))
+#define IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CLIENT))
+#define IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CLIENT))
+#define CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CLIENT, ClientClass))
+
+typedef struct _Client SeatEmitter;
+
+SeatEmitter  *client_new                     (GDBusConnection     *connection);
+
+gboolean client_set_keyboards           (SeatEmitter              *client,
+                                         const gchar * const *keyboard);
+
+gboolean client_enable_xkl              (SeatEmitter              *client);
+void     client_disable_xkl             (SeatEmitter              *client);
+
+gboolean client_enable_atspi_focus      (SeatEmitter              *client);
+void     client_disable_atspi_focus     (SeatEmitter              *client);
+
+gboolean client_enable_atspi_keystroke  (SeatEmitter              *client);
+void     client_disable_atspi_keystroke (SeatEmitter              *client);
+
+gboolean client_enable_xtest            (SeatEmitter              *client);
+void     client_disable_xtest           (SeatEmitter              *client);
+
+gboolean client_enable_ibus_focus       (SeatEmitter              *client);
+void     client_disable_ibus_focus      (SeatEmitter              *client);
+
+G_END_DECLS
+#endif  /* CLIENT_H */
--- a/src/imservice.c
+++ b/src/imservice.c
@ -5,8 +5,8 @@
 #include "eekboard/eekboard-context-service.h"


-void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause) {}
-void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose) {}
+void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method) {}
+void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method) {}
 void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method) {}


--- a/src/meson.build
+++ b/src/meson.build
@ -1,13 +1,20 @@
 gnome = import('gnome')
 dbus_src = gnome.gdbus_codegen(
    'sm.puri.OSK0',
-    join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
+    join_paths(dbusdir, 'sm.puri.OSK0.xml')
 )

+squeek_enum_headers = [
+  'squeek-input-method.h',
+]
+
+squeek_enums = gnome.mkenums_simple('squeek-enumtypes', sources: squeek_enum_headers)
+
 sources = [
  'imservice.c',
  'server-context-service.c',
  'server-main.c',
+  'squeek-input-method.c',
  'wayland.c',
  '../eek/eek.c',
  '../eek/eek-container.c',
@ -33,6 +40,7 @@ sources = [
  '../eek/layersurface.c',
  dbus_src,
  enums,
+  squeek_enums,
  keysym_entries,
  marshalers,
  '../eekboard/keymap.c',
@ -40,8 +48,7 @@ sources = [
  '../eekboard/eekboard-context-service.c',
  '../eekboard/eekboard-context.c',
  '../eekboard/eekboard-service.c',
-  #  '../eekboard/eekboard-xklutil.c',
-  squeekboard_resources,
+#  '../eekboard/eekboard-xklutil.c',
  wl_proto_sources,
 ]

--- a/src/preferences-dialog.c
+++ b/src/preferences-dialog.c
@ -0,0 +1,415 @@
+/* 
+ * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2011 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
+#include <gtk/gtk.h>
+#include "preferences-dialog.h"
+#include <eek/eek.h>
+
+struct _PreferencesDialog {
+    GtkWidget *dialog;
+    GtkWidget *repeat_toggle;
+    GtkWidget *repeat_delay_scale;
+    GtkWidget *repeat_speed_scale;
+    GtkWidget *auto_hide_toggle;
+    GtkWidget *auto_hide_delay_scale;
+    GtkWidget *selected_keyboards_treeview;
+    GtkWidget *up_button;
+    GtkWidget *down_button;
+    GtkWidget *add_button;
+    GtkWidget *remove_button;
+
+    GtkWidget *new_keyboard_dialog;
+    GtkWidget *available_keyboards_treeview;
+
+    GList *available_keyboards;
+    GSettings *settings;
+};
+
+static gboolean
+get_rate (GValue   *value,
+          GVariant *variant,
+          gpointer  user_data)
+{
+    int rate;
+    gdouble fraction;
+
+    rate = g_variant_get_uint32 (variant);
+    fraction = 1.0 / ((gdouble) rate / 1000.0);
+    g_value_set_double (value, fraction);
+    return TRUE;
+}
+
+static GVariant *
+set_rate (const GValue       *value,
+          const GVariantType *expected_type,
+          gpointer            user_data)
+{
+    gdouble rate;
+    int msecs;
+
+    rate = g_value_get_double (value);
+    msecs = (1 / rate) * 1000;
+    return g_variant_new_uint32 (msecs);
+}
+
+static void
+add_keyboard_to_treeview (GtkTreeView *treeview,
+                          const gchar *id,
+                          const gchar *longname)
+{
+    GtkTreeModel *model = gtk_tree_view_get_model (treeview);
+    GtkTreeIter iter;
+
+    if (gtk_tree_model_get_iter_first (model, &iter)) {
+        do {
+            gchar *_id;
+            gtk_tree_model_get (model, &iter, 0, &_id, -1);
+            if (g_strcmp0 (id, _id) == 0) {
+                g_free (_id);
+                return;
+            }
+            g_free (_id);
+        } while (gtk_tree_model_iter_next (model, &iter));
+    }
+
+    gtk_list_store_append (GTK_LIST_STORE(model),
+                           &iter);
+    gtk_list_store_set (GTK_LIST_STORE(model),
+                        &iter,
+                        0, id,
+                        1, longname,
+                        -1);
+}
+
+static void
+add_keyboard (GtkWidget *button, PreferencesDialog *dialog)
+{
+    gint retval = gtk_dialog_run (GTK_DIALOG(dialog->new_keyboard_dialog));
+    if (retval == GTK_RESPONSE_OK) {
+        GtkTreeSelection *selection;
+        GtkTreeModel *model;
+        GList *rows, *p;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->available_keyboards_treeview));
+        rows = gtk_tree_selection_get_selected_rows (selection, &model);
+        for (p = rows; p; p = p->next) {
+            GtkTreeIter iter;
+            if (gtk_tree_model_get_iter (model, &iter, p->data)) {
+                gchar *id, *longname;
+                gtk_tree_model_get (model, &iter, 0, &id, 1, &longname, -1);
+                add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->selected_keyboards_treeview),
+                                          id,
+                                          longname);
+                g_free (id);
+                g_free (longname);
+            }
+        }
+    }
+    gtk_widget_hide (dialog->new_keyboard_dialog);
+}
+
+static void
+remove_keyboard (GtkWidget *button, PreferencesDialog *dialog)
+{
+    GtkTreeSelection *selection;
+    GtkTreeModel *model;
+    GList *rows, *p;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
+    rows = gtk_tree_selection_get_selected_rows (selection, &model);
+    for (p = rows; p; p = p->next) {
+        GtkTreeIter iter;
+        if (gtk_tree_model_get_iter (model, &iter, p->data))
+            gtk_list_store_remove (GTK_LIST_STORE(model), &iter);
+    }
+}
+
+static void
+up_keyboard (GtkWidget *button, PreferencesDialog *dialog)
+{
+    GtkTreeSelection *selection;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
+    if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+        GtkTreeIter prev = iter;
+        if (gtk_tree_model_iter_previous (model, &prev))
+            gtk_list_store_swap (GTK_LIST_STORE(model), &iter, &prev);
+    }
+}
+
+static void
+down_keyboard (GtkWidget *button, PreferencesDialog *dialog)
+{
+    GtkTreeSelection *selection;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
+    if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+        GtkTreeIter next = iter;
+        if (gtk_tree_model_iter_next (model, &next))
+            gtk_list_store_swap (GTK_LIST_STORE(model), &iter, &next);
+    }
+}
+
+static void
+selection_changed_cb (GtkTreeSelection *selection, PreferencesDialog *dialog)
+{
+    gint count = gtk_tree_selection_count_selected_rows (selection);
+    if (count > 0) {
+        gtk_widget_set_sensitive (dialog->remove_button, TRUE);
+        gtk_widget_set_sensitive (dialog->up_button, TRUE);
+        gtk_widget_set_sensitive (dialog->down_button, TRUE);
+    } else {
+        gtk_widget_set_sensitive (dialog->remove_button, FALSE);
+        gtk_widget_set_sensitive (dialog->up_button, FALSE);
+        gtk_widget_set_sensitive (dialog->down_button, FALSE);
+    }
+}
+
+static gint
+compare_keyboard_id (const EekXmlKeyboardDesc *desc, const char *id)
+{
+    return g_strcmp0 (desc->id, id);
+}
+
+static void
+populate_selected_keyboards (PreferencesDialog *dialog)
+{
+    gchar **strv, **p;
+
+    strv = g_settings_get_strv (dialog->settings, "keyboards");
+    for (p = strv; *p != NULL; p++) {
+        GList *head = g_list_find_custom (dialog->available_keyboards,
+                                            *p,
+                                            (GCompareFunc) compare_keyboard_id);
+        if (head == NULL) {
+            g_warning ("unknown keyboard %s", *p);
+        } else {
+            EekXmlKeyboardDesc *desc = head->data;
+            add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->selected_keyboards_treeview),
+                                      desc->id,
+                                      desc->longname);
+        }
+    }
+    g_strfreev (strv);
+}
+
+static void
+populate_available_keyboards (PreferencesDialog *dialog)
+{
+    GList *p;
+
+    for (p = dialog->available_keyboards; p; p = p->next) {
+        EekXmlKeyboardDesc *desc = p->data;
+        add_keyboard_to_treeview (GTK_TREE_VIEW(dialog->available_keyboards_treeview),
+                                  desc->id,
+                                  desc->longname);
+    }
+}
+
+static void
+save_keyboards (PreferencesDialog *dialog)
+{
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    GList *list = NULL, *head;
+    gchar **strv, **p;
+
+    model = gtk_tree_view_get_model (GTK_TREE_VIEW(dialog->selected_keyboards_treeview));
+    if (gtk_tree_model_get_iter_first (model, &iter)) {
+        do {
+            gchar *id;
+            gtk_tree_model_get (model, &iter, 0, &id, -1);
+            list = g_list_prepend (list, id);
+        } while (gtk_tree_model_iter_next (model, &iter));
+    }
+    list = g_list_reverse (list);
+
+    strv = g_new0 (gchar *, g_list_length (list) + 1);
+    for (head = list, p = strv; head; head = head->next, p++) {
+        *p = head->data;
+    }
+    g_settings_set_strv (dialog->settings,
+                         "keyboards",
+                         (const gchar * const *)strv);
+    g_strfreev (strv);
+    g_list_free (list);
+}
+
+PreferencesDialog *
+preferences_dialog_new (void)
+{
+    PreferencesDialog *dialog;
+    gchar *ui_path;
+    GtkBuilder *builder;
+    GObject *object;
+    GError *error;
+    GtkListStore *store;
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
+    GtkTreeSelection *selection;
+
+    dialog = g_slice_new0 (PreferencesDialog);
+    dialog->settings = g_settings_new ("org.fedorahosted.eekboard");
+
+    builder = gtk_builder_new ();
+    gtk_builder_set_translation_domain (builder, "eekboard");
+    ui_path = g_build_filename (PKGDATADIR,
+                                "preferences-dialog.ui",
+                                NULL);
+    error = NULL;
+    if (gtk_builder_add_from_file (builder, ui_path, &error) == 0) {
+        g_warning ("can't load %s: %s", ui_path, error->message);
+        g_error_free (error);
+    }
+    g_free (ui_path);
+
+    object = gtk_builder_get_object (builder, "dialog");
+    dialog->dialog = GTK_WIDGET(object);
+
+    object = gtk_builder_get_object (builder, "repeat_toggle");
+    dialog->repeat_toggle = GTK_WIDGET(object);
+
+    g_settings_bind (dialog->settings, "repeat",
+                     dialog->repeat_toggle, "active",
+                     G_SETTINGS_BIND_DEFAULT);
+
+    object = gtk_builder_get_object (builder, "repeat_delay_scale");
+    dialog->repeat_delay_scale = GTK_WIDGET(object);
+
+    g_settings_bind (dialog->settings, "repeat-delay",
+                     gtk_range_get_adjustment (GTK_RANGE (dialog->repeat_delay_scale)), "value",
+                     G_SETTINGS_BIND_DEFAULT);
+
+    object = gtk_builder_get_object (builder, "repeat_speed_scale");
+    dialog->repeat_speed_scale = GTK_WIDGET(object);
+
+    g_settings_bind_with_mapping (dialog->settings, "repeat-interval",
+                                  gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (builder, "repeat_speed_scale"))), "value",
+                                  G_SETTINGS_BIND_DEFAULT,
+                                  get_rate, set_rate, NULL, NULL);
+
+    object = gtk_builder_get_object (builder, "auto_hide_toggle");
+    dialog->auto_hide_toggle = GTK_WIDGET(object);
+
+    g_settings_bind (dialog->settings, "auto-hide",
+                     dialog->auto_hide_toggle, "active",
+                     G_SETTINGS_BIND_DEFAULT);
+
+    object = gtk_builder_get_object (builder, "auto_hide_delay_scale");
+    dialog->auto_hide_delay_scale = GTK_WIDGET(object);
+
+    g_settings_bind (dialog->settings, "auto-hide-delay",
+                     gtk_range_get_adjustment (GTK_RANGE (dialog->auto_hide_delay_scale)), "value",
+                     G_SETTINGS_BIND_DEFAULT);
+
+    object = gtk_builder_get_object (builder,
+                                     "selected_keyboards_treeview");
+    dialog->selected_keyboards_treeview = GTK_WIDGET(object);
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
+    g_signal_connect (G_OBJECT(selection), "changed",
+                      G_CALLBACK(selection_changed_cb), dialog);
+
+    renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new ());
+    column = gtk_tree_view_column_new_with_attributes ("Keyboard",
+                                                       renderer,
+                                                       "text",
+                                                       1,
+                                                       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (object), column);
+
+    object = gtk_builder_get_object (builder, "up_button");
+    dialog->up_button = GTK_WIDGET(object);
+    g_signal_connect (object, "clicked",
+                      G_CALLBACK(up_keyboard), dialog);
+
+    object = gtk_builder_get_object (builder, "down_button");
+    dialog->down_button = GTK_WIDGET(object);
+    g_signal_connect (object, "clicked",
+                      G_CALLBACK(down_keyboard), dialog);
+
+    object = gtk_builder_get_object (builder, "add_button");
+    dialog->add_button = GTK_WIDGET(object);
+    g_signal_connect (object, "clicked",
+                      G_CALLBACK(add_keyboard), dialog);
+
+    object = gtk_builder_get_object (builder, "remove_button");
+    dialog->remove_button = GTK_WIDGET(object);
+    g_signal_connect (object, "clicked",
+                      G_CALLBACK(remove_keyboard), dialog);
+
+    object = gtk_builder_get_object (builder, "new_keyboard_dialog");
+    dialog->new_keyboard_dialog = GTK_WIDGET(object);
+
+    object = gtk_builder_get_object (builder,
+                                     "available_keyboards_treeview");
+    dialog->available_keyboards_treeview = GTK_WIDGET(object);
+
+    renderer = GTK_CELL_RENDERER(gtk_cell_renderer_text_new ());
+    column = gtk_tree_view_column_new_with_attributes ("Keyboard",
+                                                       renderer,
+                                                       "text",
+                                                       1,
+                                                       NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (object), column);
+
+    object = gtk_builder_get_object (builder,
+                                     "available_keyboards_liststore");
+    store = GTK_LIST_STORE(object);
+
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
+                                          1,
+                                          GTK_SORT_ASCENDING);
+
+    dialog->available_keyboards = eek_xml_list_keyboards ();
+
+    populate_selected_keyboards (dialog);
+    populate_available_keyboards (dialog);
+
+    g_object_unref (builder);
+
+    return dialog;
+}
+
+void
+preferences_dialog_run (PreferencesDialog *dialog)
+{
+    gtk_window_present (GTK_WINDOW(dialog->dialog));
+    gtk_dialog_run (GTK_DIALOG(dialog->dialog));
+    save_keyboards (dialog);
+}
+
+void
+preferences_dialog_free (PreferencesDialog *dialog)
+{
+    gtk_widget_destroy (dialog->dialog);
+    // gtk_widget_destroy (dialog->new_keyboard_dialog);
+
+    g_object_unref (dialog->settings);
+    g_list_free_full (dialog->available_keyboards,
+                      (GDestroyNotify) eek_xml_keyboard_desc_free);
+
+    g_slice_free (PreferencesDialog, dialog);
+}
--- a/src/preferences-dialog.h
+++ b/src/preferences-dialog.h
@ -0,0 +1,32 @@
+/* 
+ * Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2011 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef PREFERENCES_DIALOG_H
+#define PREFERENCES_DIALOG_H 1
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _PreferencesDialog PreferencesDialog;
+
+PreferencesDialog *preferences_dialog_new  (void);
+void               preferences_dialog_run  (PreferencesDialog *dialog);
+void               preferences_dialog_free (PreferencesDialog *dialog);
+
+G_END_DECLS
+#endif  /* PREFERENCES_DIALOG_H */
--- a/src/preferences-dialog.ui
+++ b/src/preferences-dialog.ui
@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAction" id="action1">
+    <property name="stock_id">gtk-close</property>
+  </object>
+  <object class="GtkAction" id="action2">
+    <property name="stock_id">gtk-cancel</property>
+  </object>
+  <object class="GtkAction" id="action3">
+    <property name="label" translatable="yes">Select</property>
+    <property name="stock_id">gtk-ok</property>
+  </object>
+  <object class="GtkAdjustment" id="auto_hide_delay_adjustment">
+    <property name="lower">100</property>
+    <property name="upper">2000</property>
+    <property name="value">500</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="available_keyboards_liststore">
+    <columns>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Keyboard</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="related_action">action1</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="keyboard_notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">10</property>
+            <child>
+              <object class="GtkVBox" id="general_page">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox22">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label300">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Repeat Keys</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox19">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="label43">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">    </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox100">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="repeat_toggle">
+                                <property name="label" translatable="yes">Key presses _repeat when key is held down</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkTable" id="repeat_table">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">4</property>
+                                <child>
+                                  <object class="GtkLabel" id="repeat_speed_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Speed:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic_widget">repeat_speed_scale</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="delay_short_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">10</property>
+                                    <property name="label" translatable="yes">Short</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="repeat_slow_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">10</property>
+                                    <property name="label" translatable="yes">Slow</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="repeat_delay_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">repeat_delay_adjustment</property>
+                                    <property name="draw_value">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="repeat_speed_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">repeat_speed_adjustment</property>
+                                    <property name="draw_value">False</property>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="repeat_speed_scale-atkobject">
+                                        <property name="AtkObject::accessible-description" translatable="yes">Repeat keys speed</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="delay_long_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Long</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="repeat_fast_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Fast</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="repeat_delay_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Delay:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic_widget">repeat_delay_scale</property>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox230">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Focus following</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="label44">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">    </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="appearances_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="auto_hide_toggle">
+                                <property name="label" translatable="yes">Auto hide window when focus is out</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="n_columns">4</property>
+                                <child>
+                                  <object class="GtkLabel" id="auto_hide_delay_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Delay:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic_widget">auto_hide_delay_scale</property>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="auto_hide_delay_short_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="xpad">10</property>
+                                    <property name="label" translatable="yes">Short</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHScale" id="auto_hide_delay_scale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">auto_hide_delay_adjustment</property>
+                                    <property name="draw_value">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="auto_hide_delay_long_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Long</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.82999999999999996"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="x_options">GTK_SHRINK</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Typing</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="keyboards_page">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkTreeView" id="selected_keyboards_treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">selected_keyboards_liststore</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection2"/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButtonBox" id="buttonbox1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">2</property>
+                    <property name="layout_style">end</property>
+                    <child>
+                      <object class="GtkButton" id="up_button">
+                        <property name="label">gtk-go-up</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="down_button">
+                        <property name="label">gtk-go-down</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="add_button">
+                        <property name="label">gtk-add</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="remove_button">
+                        <property name="label">gtk-remove</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Keyboards</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="new_keyboard_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="default_height">430</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="transient_for">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="related_action">action2</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="related_action">action3</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="available_keyboards_treeview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">available_keyboards_liststore</property>
+                <property name="headers_visible">False</property>
+                <property name="headers_clickable">False</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection3"/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button2</action-widget>
+      <action-widget response="-5">button3</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" id="repeat_delay_adjustment">
+    <property name="lower">100</property>
+    <property name="upper">2000</property>
+    <property name="value">500</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="repeat_speed_adjustment">
+    <property name="lower">0.5</property>
+    <property name="upper">50</property>
+    <property name="value">33.299999999999997</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkListStore" id="selected_keyboards_liststore">
+    <columns>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+</interface>
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@ -1,7 +1,7 @@
-/*
+/* 
 * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
 * Copyright (C) 2010-2011 Red Hat, Inc.
- *
+ * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
@ -65,10 +65,10 @@ static void set_dock      (GtkWidget            *widget,
                           GtkAllocation        *allocation);

 static void
-on_monitors_changed (GdkScreen            *screen,
-                     ServerContextService *context)
-
+on_monitors_changed (GdkScreen *screen,
+                     gpointer   user_data)
 {
+    ServerContextService *context = user_data;
    if (context->window)
        set_geometry (context);
 }
@ -87,16 +87,18 @@ on_destroy (GtkWidget *widget, gpointer user_data)
 }

 static void
-on_notify_keyboard (GObject              *object,
-                    GParamSpec           *spec,
-                    ServerContextService *context)
+on_notify_keyboard (GObject    *object,
+                    GParamSpec *spec,
+                    gpointer    user_data)
 {
+    ServerContextService *context = user_data;
    const EekKeyboard *keyboard;

    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));

-    if (!keyboard)
+    if (!keyboard) {
        g_error("Programmer error: keyboard layout was unset!");
+    }

    // The keymap will get set even if the window is hidden.
    // It's not perfect,
@ -107,7 +109,8 @@ on_notify_keyboard (GObject              *object,
    if (context->window) {
        if (keyboard == NULL) {
            gtk_widget_hide (context->window);
-            g_clear_pointer (&context->widget, gtk_widget_destroy);
+            gtk_widget_destroy (context->widget);
+            context->widget = NULL;
        } else {
            gboolean was_visible = gtk_widget_get_visible (context->window);
            /* avoid to send KeyboardVisibilityChanged */
@ -122,21 +125,21 @@ on_notify_keyboard (GObject              *object,
        }
    }
 }
-
+        
 static void
-on_notify_fullscreen (GObject              *object,
-                      GParamSpec           *spec,
-                      ServerContextService *context)
+on_notify_fullscreen (GObject    *object,
+                      GParamSpec *spec,
+                      gpointer    user_data)
 {
+    ServerContextService *context = user_data;
    if (context->window)
        set_geometry (context);
 }

 static void
-on_notify_visible (GObject    *object,
-                   GParamSpec *spec,
-                   ServerContextService *context)
+on_notify_visible (GObject *object, GParamSpec *spec, gpointer user_data)
 {
+    ServerContextService *context = user_data;
    gboolean visible;

    g_object_get (object, "visible", &visible, NULL);
@ -152,7 +155,7 @@ set_dock (GtkWidget *widget, GtkAllocation *allocation)

    /* set window type to dock */
    gdk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DOCK);
-
+  
    vals[0] = 0;
    vals[1] = 0;
    vals[2] = 0;
@ -195,9 +198,10 @@ on_size_allocate_set_dock (GtkWidget *widget,
 }

 static void
-on_realize_set_non_maximizable (GtkWidget            *widget,
-                                ServerContextService *context)
+on_realize_set_non_maximizable (GtkWidget *widget,
+                                gpointer   user_data)
 {
+    ServerContextService *context = user_data;

    g_assert (context && context->window == widget);

@ -212,16 +216,18 @@ on_realize_set_non_maximizable (GtkWidget            *widget,
 static void
 set_geometry (ServerContextService *context)
 {
-    GdkScreen   *screen   = gdk_screen_get_default ();
-    GdkWindow   *root     = gdk_screen_get_root_window (screen);
-    GdkDisplay  *display  = gdk_display_get_default ();
-    GdkMonitor  *monitor  = gdk_display_get_monitor_at_window (display, root);
-    EekKeyboard *keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
-
+    GdkScreen *screen;
+    GdkWindow *root;
+    gint monitor;
    GdkRectangle rect;
+    const EekKeyboard *keyboard;
    EekBounds bounds;

-    gdk_monitor_get_geometry (monitor, &rect);
+    screen = gdk_screen_get_default ();
+    root = gtk_widget_get_root_window (context->window);
+    monitor = gdk_screen_get_monitor_at_window (screen, root);
+    gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);

    g_signal_handlers_disconnect_by_func (context->window,
@ -232,14 +238,14 @@ set_geometry (ServerContextService *context)
                                          context);

    if (eekboard_context_service_get_fullscreen (EEKBOARD_CONTEXT_SERVICE(context))) {
-        gint width  = rect.width;
+        gint width = rect.width;
        gint height = rect.height;

        if (width > height) {
-            width  *= context->size_constraint_landscape[0];
+            width *= context->size_constraint_landscape[0];
            height *= context->size_constraint_landscape[1];
        } else {
-            width  *= context->size_constraint_portrait[0];
+            width *= context->size_constraint_portrait[0];
            height *= context->size_constraint_portrait[1];
        }

@ -276,16 +282,16 @@ set_geometry (ServerContextService *context)
 }

 static void
-make_window (ServerContextService *context)
-{
-    if (context->window)
+make_window (ServerContextService *context) {
+    if (context->window) {
        g_error("Window already present");
-
-    context->window = g_object_new (
+        return;
+    }
+    context->window = GTK_WIDGET(g_object_new (
        PHOSH_TYPE_LAYER_SURFACE,
        "layer-shell", squeek_wayland->layer_shell,
        "wl-output", g_ptr_array_index(squeek_wayland->outputs, 0), // TODO: select output as needed,
-        "height", 210,
+        "height", 200,
        "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                  | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
@ -294,16 +300,12 @@ make_window (ServerContextService *context)
        "exclusive-zone", 200,
        //"namespace", "phosh home",
        NULL
-    );
-
+    ));
    g_signal_connect (context->window, "destroy",
-                      G_CALLBACK(on_destroy),
-                      context);
-
+                      G_CALLBACK(on_destroy), context);
    context->notify_visible_handler =
        g_signal_connect (context->window, "notify::visible",
-                          G_CALLBACK(on_notify_visible),
-                          context);
+                          G_CALLBACK(on_notify_visible), context);

    // The properties below are just to make hacking easier.
    // The way we use layer-shell overrides some,
@ -319,8 +321,7 @@ make_window (ServerContextService *context)
 }

 static void
-destroy_window (ServerContextService *context)
-{
+destroy_window (ServerContextService *context) {
    context->window = NULL;
 }

@ -328,23 +329,25 @@ static void
 update_widget (ServerContextService *context)
 {
    EekKeyboard *keyboard;
+    EekBounds bounds;
+    gchar *theme_path;
    EekTheme *theme;
-
+    
    if (context->widget) {
        gtk_widget_destroy (context->widget);
        context->widget = NULL;
    }

-    theme = eek_theme_new ("resource:///sm/puri/squeekboard/style.css",
-                           NULL,
-                           NULL);
+    theme_path = g_build_filename (THEMESDIR, "default.css", NULL);
+
+    theme = eek_theme_new (theme_path, NULL, NULL);
+    g_free (theme_path);

    keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
-
+    eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
    context->widget = eek_gtk_keyboard_new (keyboard);
-
    eek_gtk_keyboard_set_theme (EEK_GTK_KEYBOARD(context->widget), theme);
-    g_clear_object (&theme);
+    g_object_unref (theme);

    gtk_widget_set_has_tooltip (context->widget, TRUE);
    gtk_container_add (GTK_CONTAINER(context->window), context->widget);
@ -369,8 +372,7 @@ server_context_service_real_hide_keyboard (EekboardContextService *_context)
    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);

    gtk_widget_hide (context->window);
-    g_clear_pointer (&context->widget, gtk_widget_destroy);
-
+    gtk_container_remove(GTK_CONTAINER(context->window), context->widget);
    destroy_window (context);

    EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
@ -392,7 +394,8 @@ server_context_service_real_disabled (EekboardContextService *_context)
    ServerContextService *context = SERVER_CONTEXT_SERVICE(_context);

    if (context->window) {
-        context->was_visible = gtk_widget_get_visible (context->window);
+        context->was_visible =
+            gtk_widget_get_visible (context->window);
        gtk_widget_hide (context->window);
    }
 }
@ -436,8 +439,10 @@ server_context_service_dispose (GObject *object)
 {
    ServerContextService *context = SERVER_CONTEXT_SERVICE(object);

-    g_clear_pointer (&context->window, gtk_widget_destroy);
-    context->widget = NULL;
+    if (context->window) {
+        gtk_widget_destroy (context->window);
+        context->window = NULL;
+    }

    G_OBJECT_CLASS (server_context_service_parent_class)->dispose (object);
 }
@ -482,8 +487,9 @@ server_context_service_class_init (ServerContextServiceClass *klass)
 static void
 server_context_service_init (ServerContextService *context)
 {
-    GdkScreen *screen = gdk_screen_get_default ();
+    GdkScreen *screen;

+    screen = gdk_screen_get_default ();
    g_signal_connect (screen,
                      "monitors-changed",
                      G_CALLBACK(on_monitors_changed),
@ -492,7 +498,6 @@ server_context_service_init (ServerContextService *context)
                      "notify::keyboard",
                      G_CALLBACK(on_notify_keyboard),
                      context);
-
    g_signal_connect (context,
                      "notify::fullscreen",
                      G_CALLBACK(on_notify_fullscreen),
@ -502,5 +507,6 @@ server_context_service_init (ServerContextService *context)
 EekboardContextService *
 server_context_service_new ()
 {
-    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL));
+    return EEKBOARD_CONTEXT_SERVICE(g_object_new (SERVER_TYPE_CONTEXT_SERVICE,
+                         NULL));
 }
--- a/src/setup-main.c
+++ b/src/setup-main.c
@ -0,0 +1,41 @@
+/* 
+ * Copyright (C) 2012 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2012 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "preferences-dialog.h"
+#include <gtk/gtk.h>
+#include <stdlib.h>
+
+int
+main (int argc, char **argv)
+{
+    PreferencesDialog *dialog;
+
+    if (!gtk_init_check (&argc, &argv)) {
+        g_printerr ("Can't init GTK\n");
+        return EXIT_FAILURE;
+    }
+
+    dialog = preferences_dialog_new ();
+    preferences_dialog_run (dialog);
+    preferences_dialog_free (dialog);
+
+    return EXIT_SUCCESS;
+}
--- a/src/squeek-input-method.c
+++ b/src/squeek-input-method.c
@ -0,0 +1,544 @@
+/* squeek-input-method.c */
+#include "squeek-input-method.h"
+
+#include <stdio.h>
+
+typedef struct _SqueekInputMethodPrivate {
+    struct zwp_input_method_v2         *input_method;
+
+    gchar                              *surrounding_text;
+    gchar                              *preedit_string;
+
+    guint                               serial;
+
+    guint                               cursor;
+    guint                               anchor;
+
+    guint                               hint;
+    guint                               purpose;
+
+    gboolean                            active    : 1;
+    gboolean                            available : 1;
+} SqueekInputMethodPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(SqueekInputMethod, squeek_input_method, G_TYPE_OBJECT)
+
+/*
+ * TODO:
+ *   - implement signals for 'done' and ... (?)
+ *   - take it for a spin
+ *   - fix things
+ *   - look at 'zwp_input_popup_surface_v2' and think about it for a while
+ *     ....
+ *   - add some gir documentation
+ *   - double check: everyting
+ *   
+ *   - MOVE ON
+ */
+
+enum {
+    PROP_0,
+    PROP_AVAILABLE,
+    PROP_ACTIVE,
+    PROP_CURSOR_POSITION,
+    PROP_ANCHOR_POSITION,
+    PROP_CONTENT_HINT,
+    PROP_CONTENT_PURPOSE,
+    PROP_SURROUNDING_TEXT,
+    PROP_PREEDIT_STRING,
+    LAST_PROP
+};
+
+static GParamSpec *properties[LAST_PROP];
+
+/* input-method signals */
+static void
+squeek_input_method_activate(SqueekInputMethod *self)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    if (!priv->active) {
+        priv->active = TRUE;
+        g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_ACTIVE]);
+    }
+}
+
+static void
+squeek_input_method_deactivate(SqueekInputMethod *self)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    if (priv->active) {
+        priv->active = FALSE;
+        g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_ACTIVE]);
+    }
+}
+
+static void
+squeek_input_method_surrounding_text(SqueekInputMethod *self,
+                                     const gchar       *text,
+                                     guint              cursor,
+                                     guint              anchor)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    g_clear_pointer(&priv->surrounding_text, g_free);
+
+    priv->surrounding_text = g_strdup(text);
+    priv->cursor           = cursor;
+    priv->anchor           = anchor;
+
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_SURROUNDING_TEXT]);
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_CURSOR_POSITION]);
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_ANCHOR_POSITION]);
+}
+
+static void
+squeek_input_method_text_change_cause(SqueekInputMethod *self,
+                                      guint              cause)
+{
+    fprintf(stderr, "%s: not implemented\n", __func__);
+}
+
+static void
+squeek_input_method_content_type(SqueekInputMethod *self,
+                                 guint              hint,
+                                 guint              purpose)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    priv->hint    = hint;
+    priv->purpose = purpose;
+
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_CONTENT_HINT]);
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_CONTENT_PURPOSE]);
+}
+
+static void
+squeek_input_method_done(SqueekInputMethod *self)
+{
+    /* 
+        Atomically applies state changes recently sent to the client.
+
+        The done event establishes and updates the state of the client, and
+        must be issued after any changes to apply them.
+
+        Text input state (content purpose, content hint, surrounding text, and
+        change cause) is conceptually double-buffered within an input method
+        context.
+
+        Events modify the pending state, as opposed to the current state in use
+        by the input method. A done event atomically applies all pending state,
+        replacing the current state. After done, the new pending state is as
+        documented for each related request.
+
+        Events must be applied in the order of arrival.
+
+        Neither current nor pending state are modified unless noted otherwise.
+     */
+
+    fprintf(stderr, "%s: not implemented\n", __func__);
+}
+
+static void
+squeek_input_method_unavailable(SqueekInputMethod *self)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    priv->available = FALSE;
+
+    g_clear_pointer(&priv->input_method, zwp_input_method_v2_destroy); 
+
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_AVAILABLE]);
+}
+
+static void
+imservice_handle_input_method_activate(void                       *data,
+                                       struct zwp_input_method_v2 *input_method)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->activate(data);
+}
+
+static void
+imservice_handle_input_method_deactivate(void                       *data,
+                                         struct zwp_input_method_v2 *input_method)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->deactivate(data);
+}
+
+static void
+imservice_handle_surrounding_text(void                       *data,
+                                  struct zwp_input_method_v2 *input_method,
+                                  const char                 *text,
+                                  uint32_t                    cursor,
+                                  uint32_t                    anchor)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->surrounding_text(data, text, cursor, anchor);
+}
+
+static void
+imservice_handle_text_change_cause(void                       *data,
+                                   struct zwp_input_method_v2 *input_method,
+                                   uint32_t                    cause)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->text_change_cause(data, cause);
+}
+
+static void
+imservice_handle_content_type(void                       *data,
+                              struct zwp_input_method_v2 *input_method,
+                              uint32_t                    hint,
+                              uint32_t                    purpose)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->content_type(data, hint, purpose);
+}
+
+static void
+imservice_handle_done(void                       *data,
+                      struct zwp_input_method_v2 *input_method)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->done(data);
+}
+
+static void
+imservice_handle_unavailable(void                       *data,
+                             struct zwp_input_method_v2 *input_method)
+{
+    g_return_if_fail(data && SQUEEK_IS_INPUT_METHOD(data));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(data)->unavailable(data);
+}
+
+static const struct zwp_input_method_v2_listener input_method_listener = {
+    .activate          = imservice_handle_input_method_activate,
+    .deactivate        = imservice_handle_input_method_deactivate,
+    .surrounding_text  = imservice_handle_surrounding_text,
+    .text_change_cause = imservice_handle_text_change_cause,
+    .content_type      = imservice_handle_content_type,
+    .done              = imservice_handle_done,
+    .unavailable       = imservice_handle_unavailable,
+};
+
+/* input-method requests */
+static void
+squeek_input_method_real_commit_string(SqueekInputMethod *self,
+                                       const gchar       *string)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    zwp_input_method_v2_commit_string(priv->input_method,
+                                      string);
+}
+
+void
+squeek_input_method_commit_string(SqueekInputMethod *self,
+                                  const gchar       *string)
+{
+    g_return_if_fail(self && SQUEEK_IS_INPUT_METHOD(self));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(self)->commit_string(self,
+                                                       string);
+}
+
+static void
+squeek_input_method_real_preedit_string(SqueekInputMethod *self,
+                                        const gchar       *text,
+                                        gint               cursor_begin,
+                                        gint               cursor_end)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    g_clear_pointer(&priv->preedit_string, g_free);
+    priv->preedit_string = g_strdup(text);
+
+    /* TODO: think about cursor_[begin|end] */
+
+    zwp_input_method_v2_preedit_string(priv->input_method,
+                                       priv->preedit_string,
+                                       cursor_begin,
+                                       cursor_end);
+
+    g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_PREEDIT_STRING]);
+}
+
+void
+squeek_input_method_preedit_string(SqueekInputMethod *self,
+                                   const gchar       *text,
+                                   gint               cursor_begin,
+                                   gint               cursor_end)
+{
+    g_return_if_fail(self && SQUEEK_IS_INPUT_METHOD(self));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(self)->preedit_string(self,
+                                                        text,
+                                                        cursor_begin,
+                                                        cursor_end);
+}
+
+static void
+squeek_input_method_real_delete_surrounding_text(SqueekInputMethod *self,
+                                                 guint              before_length,
+                                                 guint              after_length)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    zwp_input_method_v2_delete_surrounding_text(priv->input_method,
+                                                before_length,
+                                                after_length);
+}
+
+void
+squeek_input_method_delete_surrounding_text(SqueekInputMethod *self,
+                                            guint              before_length,
+                                            guint              after_length)
+{
+    g_return_if_fail(self && SQUEEK_IS_INPUT_METHOD(self));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(self)->delete_surrounding_text(self,
+                                                                 before_length,
+                                                                 after_length);
+}
+
+static void
+squeek_input_method_real_commit(SqueekInputMethod *self)
+{
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    g_return_if_fail(priv->available);
+
+    zwp_input_method_v2_commit(priv->input_method,
+                               priv->serial++);
+}
+
+void
+squeek_input_method_commit(SqueekInputMethod *self)
+{
+    g_return_if_fail(self && SQUEEK_IS_INPUT_METHOD(self));
+
+    SQUEEK_INPUT_METHOD_GET_CLASS(self)->commit(self);
+}
+
+static void
+squeek_input_method_dispose(GObject *object)
+{
+    SqueekInputMethod        *self = SQUEEK_INPUT_METHOD(object);
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    priv->active    = FALSE;
+    priv->available = FALSE;
+
+    g_clear_pointer(&priv->input_method, zwp_input_method_v2_destroy);
+
+    G_OBJECT_CLASS(squeek_input_method_parent_class)->dispose(object);
+}
+
+static void
+squeek_input_method_init(SqueekInputMethod *self)
+{
+}
+
+static void
+squeek_input_method_get_property(GObject    *object,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+    SqueekInputMethod        *self = SQUEEK_INPUT_METHOD(object);
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    switch (prop_id) {
+        case PROP_AVAILABLE:
+            g_value_set_boolean(value, priv->available);
+            break;
+        case PROP_ACTIVE:
+            g_value_set_boolean(value, priv->active);
+            break;
+        case PROP_CURSOR_POSITION:
+            g_value_set_uint(value, priv->cursor);
+            break;
+        case PROP_ANCHOR_POSITION:
+            g_value_set_uint(value, priv->anchor);
+            break;
+        case PROP_CONTENT_HINT:
+            g_value_set_flags(value, priv->hint);
+            break;
+        case PROP_CONTENT_PURPOSE:
+            g_value_set_enum(value, priv->purpose);
+            break;
+        case PROP_SURROUNDING_TEXT:
+            g_value_set_string(value, priv->surrounding_text);
+            break;
+        case PROP_PREEDIT_STRING:
+            g_value_set_string(value, priv->preedit_string);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
+}
+
+static void
+squeek_input_method_set_property(GObject      *object,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+    SqueekInputMethod        *self = SQUEEK_INPUT_METHOD(object);
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    switch (prop_id) {
+        case PROP_ACTIVE:
+            priv->active = g_value_get_boolean(value);
+
+            break;
+
+        /* FIXME: should preedit string be writable without setting cursor? */
+        case PROP_PREEDIT_STRING:
+            g_clear_pointer(&priv->preedit_string, g_free);
+            priv->preedit_string = g_strdup(g_value_get_string(value));
+
+            break;
+
+        case PROP_AVAILABLE:
+            /* fall-through: not writable */
+        case PROP_CURSOR_POSITION:
+            /* fall-through: not writable */
+        case PROP_ANCHOR_POSITION:
+            /* fall-through: not writable */
+        case PROP_CONTENT_HINT:
+            /* fall-through: not writable */
+        case PROP_CONTENT_PURPOSE:
+            /* fall-through: not writable */
+        case PROP_SURROUNDING_TEXT:
+            /* fall-through: not writable */
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
+    }
+}
+
+static void
+squeek_input_method_class_init(SqueekInputMethodClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+    object_class->dispose          = squeek_input_method_dispose;
+    object_class->get_property     = squeek_input_method_get_property;
+    object_class->set_property     = squeek_input_method_set_property;
+
+    /* events */
+    klass->activate                = squeek_input_method_activate;
+    klass->deactivate              = squeek_input_method_deactivate;
+    klass->surrounding_text        = squeek_input_method_surrounding_text;
+    klass->text_change_cause       = squeek_input_method_text_change_cause;
+    klass->content_type            = squeek_input_method_content_type;
+    klass->done                    = squeek_input_method_done;
+    klass->unavailable             = squeek_input_method_unavailable;
+
+    /* requests */
+    klass->commit_string           = squeek_input_method_real_commit_string;
+    klass->preedit_string          = squeek_input_method_real_preedit_string;
+    klass->delete_surrounding_text = squeek_input_method_real_delete_surrounding_text;
+    klass->commit                  = squeek_input_method_real_commit;
+
+    properties[PROP_AVAILABLE] =
+        g_param_spec_boolean("available",
+                             "available",
+                             "Availability of this input method (destroy if FALSE)",
+                             FALSE,
+                             G_PARAM_READABLE);
+
+    properties[PROP_ACTIVE] =
+        g_param_spec_boolean("active",
+                             "active",
+                             "This input method is active",
+                             FALSE,
+                             G_PARAM_READWRITE);
+
+    properties[PROP_CURSOR_POSITION] =
+        g_param_spec_uint("cursor-position",
+                          "cursor-position",
+                          "The position of the cursor in characters",
+                          0, G_MAXUINT, 0,
+                          G_PARAM_READABLE);
+
+    properties[PROP_ANCHOR_POSITION] =
+        g_param_spec_uint("anchor-position",
+                          "anchor-position",
+                          "Offset where the current selection starts, or the same as cursor-position",
+                          0, G_MAXUINT, 0,
+                          G_PARAM_READABLE);
+
+    properties[PROP_CONTENT_HINT] =
+        g_param_spec_flags("content-hint",
+                           "content-hint",
+                           "Hint to guide the behaviour of the input method",
+                           SQUEEK_TYPE_INPUT_METHOD_HINT,
+                           SQUEEK_INPUT_METHOD_HINT_NONE,
+                           G_PARAM_READABLE);
+
+    properties[PROP_CONTENT_PURPOSE] =
+        g_param_spec_enum("content-purpose",
+                          "content-purpose",
+                          "The purpose of a text input",
+                          SQUEEK_TYPE_INPUT_METHOD_PURPOSE,
+                          SQUEEK_INPUT_METHOD_PURPOSE_NORMAL,
+                          G_PARAM_READABLE);
+
+    properties[PROP_SURROUNDING_TEXT] =
+        g_param_spec_string("surrounding-text",
+                            "surrounding-text",
+                            "The text surrounding the cursor",
+                            "",
+                            G_PARAM_READABLE);
+
+    properties[PROP_PREEDIT_STRING] =
+        g_param_spec_string("preedit-string",
+                            "preedit-string",
+                            "Pre-edit string",
+                            "",
+                            G_PARAM_READWRITE);
+
+    g_object_class_install_properties(object_class, LAST_PROP, properties);
+}
+
+SqueekInputMethod *
+squeek_input_method_new(struct zwp_input_method_manager_v2 *manager,
+                        struct wl_seat                     *seat)
+{
+    SqueekInputMethod *self = g_object_new(SQUEEK_TYPE_INPUT_METHOD, NULL);
+    SqueekInputMethodPrivate *priv = squeek_input_method_get_instance_private(self);
+
+    priv->input_method = zwp_input_method_manager_v2_get_input_method(manager, seat);
+
+    zwp_input_method_v2_add_listener(priv->input_method, &input_method_listener, self);
+
+    return self;
+}
--- a/src/squeek-input-method.h
+++ b/src/squeek-input-method.h
@ -0,0 +1,181 @@
+#pragma once 
+
+#include <glib-object.h>
+
+#include "input-method-unstable-v2-client-protocol.h"
+#include "text-input-unstable-v3-client-protocol.h"
+#include "squeek-enumtypes.h"
+
+G_BEGIN_DECLS
+
+#define SQUEEK_TYPE_INPUT_METHOD (squeek_input_method_get_type())
+G_DECLARE_DERIVABLE_TYPE(SqueekInputMethod, squeek_input_method, SQUEEK, INPUT_METHOD, GObject)
+
+typedef enum {
+    /**
+     * no special behavior
+     */
+    SQUEEK_INPUT_METHOD_HINT_NONE                = ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE,
+    /**
+     * suggest word completions
+     */
+    SQUEEK_INPUT_METHOD_HINT_COMPLETION          = ZWP_TEXT_INPUT_V3_CONTENT_HINT_COMPLETION,
+    /**
+     * suggest word corrections
+     */
+    SQUEEK_INPUT_METHOD_HINT_SPELLCHECK          = ZWP_TEXT_INPUT_V3_CONTENT_HINT_SPELLCHECK,
+    /**
+     * switch to uppercase letters at the start of a sentence
+     */
+    SQUEEK_INPUT_METHOD_HINT_AUTO_CAPITALIZATION = ZWP_TEXT_INPUT_V3_CONTENT_HINT_AUTO_CAPITALIZATION,
+    /**
+     * prefer lowercase letters
+     */
+    SQUEEK_INPUT_METHOD_HINT_LOWERCASE           = ZWP_TEXT_INPUT_V3_CONTENT_HINT_LOWERCASE,
+    /**
+     * prefer uppercase letters
+     */
+    SQUEEK_INPUT_METHOD_HINT_UPPERCASE           = ZWP_TEXT_INPUT_V3_CONTENT_HINT_UPPERCASE,
+    /**
+     * prefer casing for titles and headings (can be language dependent)
+     */
+    SQUEEK_INPUT_METHOD_HINT_TITLECASE           = ZWP_TEXT_INPUT_V3_CONTENT_HINT_TITLECASE,
+    /**
+     * characters should be hidden
+     */
+    SQUEEK_INPUT_METHOD_HINT_HIDDEN_TEXT         = ZWP_TEXT_INPUT_V3_CONTENT_HINT_HIDDEN_TEXT,
+    /**
+     * typed text should not be stored
+     */
+    SQUEEK_INPUT_METHOD_HINT_SENSITIVE_DATA      = ZWP_TEXT_INPUT_V3_CONTENT_HINT_SENSITIVE_DATA,
+    /**
+     * just Latin characters should be entered
+     */
+    SQUEEK_INPUT_METHOD_HINT_LATIN               = ZWP_TEXT_INPUT_V3_CONTENT_HINT_LATIN,
+    /**
+     * the text input is multiline
+     */
+    SQUEEK_INPUT_METHOD_HINT_MULTILINE           = ZWP_TEXT_INPUT_V3_CONTENT_HINT_MULTILINE,
+} SqueekInputMethodHint;
+
+typedef enum {
+    /**
+     * default input, allowing all characters
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_NORMAL   = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL,
+    /**
+     * allow only alphabetic characters
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_ALPHA    = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_ALPHA,
+    /**
+     * allow only digits
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_DIGITS   = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DIGITS,
+    /**
+     * input a number (including decimal separator and sign)
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_NUMBER   = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER,
+    /**
+     * input a phone number
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_PHONE    = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE,
+    /**
+     * input an URL
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_URL      = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_URL,
+    /**
+     * input an email address
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_EMAIL    = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_EMAIL,
+    /**
+     * input a name of a person
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_NAME     = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NAME,
+    /**
+     * input a password (combine with sensitive_data hint)
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_PASSWORD = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PASSWORD,
+    /**
+     * input is a numeric password (combine with sensitive_data hint)
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_PIN      = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PIN,
+    /**
+     * input a date
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_DATE     = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DATE,
+    /**
+     * input a time
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_TIME     = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TIME,
+    /**
+     * input a date and time
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_DATETIME = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DATETIME,
+    /**
+     * input for a terminal
+     */
+    SQUEEK_INPUT_METHOD_PURPOSE_TERMINAL = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL,
+} SqueekInputMethodPurpose;
+
+
+struct _SqueekInputMethodClass {
+    GObjectClass        parent_class;
+
+    /* input-method signals */
+    void        (*activate)                       (SqueekInputMethod *self);
+
+    void        (*deactivate)                     (SqueekInputMethod *self);
+
+    void        (*surrounding_text)               (SqueekInputMethod *self,
+                                                   const gchar       *text,
+                                                   guint              cursor,
+                                                   guint              anchor);
+
+    void        (*text_change_cause)              (SqueekInputMethod *self,
+                                                   guint              cause);
+
+    void        (*content_type)                   (SqueekInputMethod *self,
+                                                   guint              hint,
+                                                   guint              purpose);
+
+    void        (*done)                           (SqueekInputMethod *self);
+
+    void        (*unavailable)                    (SqueekInputMethod *self);
+
+    /* input-method requests */
+    void        (*commit_string)                  (SqueekInputMethod *self,
+                                                   const gchar       *string);
+
+    void        (*preedit_string)                 (SqueekInputMethod *self,
+                                                   const gchar       *text,
+                                                   gint               cursor_begin,
+                                                   gint               cursor_end);
+
+    void        (*delete_surrounding_text)        (SqueekInputMethod *self,
+                                                   guint              before_length,
+                                                   guint              after_length);
+
+
+    void        (*commit)                         (SqueekInputMethod *self);
+};
+
+void                 squeek_input_method_commit_string          (SqueekInputMethod *self,
+                                                                 const gchar       *string);
+
+void                 squeek_input_method_preedit_string         (SqueekInputMethod *self,
+                                                                 const gchar       *text,
+                                                                 gint               cursor_begin,
+                                                                 gint               cursor_end);
+
+void                 squeek_input_method_delete_surrounding_text(SqueekInputMethod *self,
+                                                                 guint              before_length,
+                                                                 guint              after_length);
+
+void                 squeek_input_method_commit                 (SqueekInputMethod *self);
+
+SqueekInputMethod   *squeek_input_method_new                    (struct zwp_input_method_manager_v2 *manager,
+                                                                 struct wl_seat                     *seat);
+
+G_END_DECLS
+
+