diff --git a/eek/eek-clutter-renderer.c b/eek/eek-clutter-renderer.c
index adcbac71..3eeb6c6e 100644
--- a/eek/eek-clutter-renderer.c
+++ b/eek/eek-clutter-renderer.c
@@ -111,15 +111,19 @@ eek_clutter_renderer_render_key (EekClutterRenderer *renderer,
     PangoRectangle extents = { 0, };
     CoglColor color = { 0x00, 0x00, 0x00, 0xFF };
     ClutterGeometry geom;
+    gulong oref;
+    EekKeyboard *keyboard;
 
     g_assert (EEK_IS_CLUTTER_RENDERER(renderer));
     g_assert (CLUTTER_IS_ACTOR(actor));
     g_assert (EEK_IS_KEY(key));
 
+    oref = eek_key_get_oref (key);
+    g_object_get (renderer, "keyboard", &keyboard, NULL);
+    outline = eek_keyboard_get_outline (keyboard, oref);
+    g_object_unref (keyboard);
+
     priv = EEK_CLUTTER_RENDERER_GET_PRIVATE(renderer);
-
-    outline = eek_key_get_outline (key);
-
     outline_texture = g_hash_table_lookup (priv->outline_texture_cache,
                                            outline);
     if (!outline_texture) {
diff --git a/src/server-context.c b/src/server-context.c
index 1fe0d706..abdd0df7 100644
--- a/src/server-context.c
+++ b/src/server-context.c
@@ -188,7 +188,7 @@ update_widget (ServerContext *context)
 #if HAVE_CLUTTER_GTK
     context->widget = gtk_clutter_embed_new ();
     stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED(context->widget));
-    actor = eek_clutter_context_new (context->keyboard);
+    actor = eek_clutter_keyboard_new (context->keyboard);
     clutter_container_add_actor (CLUTTER_CONTAINER(stage), actor);
 
     clutter_stage_set_color (CLUTTER_STAGE(stage), &stage_color);