diff --git a/scenarios/ui/p300-tactile.ui b/scenarios/ui/p300-tactile-6.ui
similarity index 97%
rename from scenarios/ui/p300-tactile.ui
rename to scenarios/ui/p300-tactile-6.ui
index 2abccde..acfaebc 100644
--- a/scenarios/ui/p300-tactile.ui
+++ b/scenarios/ui/p300-tactile-6.ui
@@ -1,253 +1,253 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="p300-speller">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <child>
-      <object class="GtkTable" id="p300-speller-main">
-        <property name="visible">True</property>
-        <property name="n_rows">3</property>
-        <property name="row_spacing">4</property>
-        <child>
-          <object class="GtkTable" id="p300-speller-table">
-            <property name="visible">True</property>
-            <property name="n_rows">6</property>
-            <property name="n_columns">1</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkEventBox" id="eventbox-1">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor1</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEventBox" id="eventbox-2">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-2">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor2</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEventBox" id="eventbox-3">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-3">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor3</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEventBox" id="eventbox-4">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-4">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor4</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEventBox" id="eventbox-5">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-5">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor5</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEventBox" id="eventbox-6">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label-6">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Motor6</property>
-                    <property name="use_markup">True</property>
-                    <property name="justify">center</property>
-                  </object>
-                </child>
-              </object>
-			  <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTable" id="p300-speller-table-target-result">
-            <property name="visible">True</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">3</property>
-            <property name="column_spacing">4</property>
-            <property name="row_spacing">4</property>
-            <child>
-              <object class="GtkLabel" id="label-result">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="single_line_mode">True</property>
-              </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">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label-target">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="single_line_mode">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label-result-title">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Result :</property>
-                <property name="single_line_mode">True</property>
-              </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_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label-target-title">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Target :</property>
-                <property name="single_line_mode">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage" id="image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-select-font</property>
-              </object>
-              <packing>
-                <property name="bottom_attach">2</property>
-                <property name="x_options"></property>
-                <property name="y_options"></property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options">GTK_FILL</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHSeparator" id="hseparator">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="p300-speller-toolbar">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title" translatable="yes">P300 Speller</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="width_request">640</property>
-        <property name="visible">True</property>
-        <property name="toolbar_style">both</property>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton-show_target_text">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Show Target Text</property>
-            <property name="stock_id">gtk-info</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton-show_result_text">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Show Result Text</property>
-            <property name="stock_id">gtk-info</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="p300-speller">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <child>
+      <object class="GtkTable" id="p300-speller-main">
+        <property name="visible">True</property>
+        <property name="n_rows">3</property>
+        <property name="row_spacing">4</property>
+        <child>
+          <object class="GtkTable" id="p300-speller-table">
+            <property name="visible">True</property>
+            <property name="n_rows">6</property>
+            <property name="n_columns">1</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkEventBox" id="eventbox-1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor1</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox-2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor2</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox-3">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor3</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox-4">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-4">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor4</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox-5">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-5">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor5</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox-6">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label-6">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Motor6</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                  </object>
+                </child>
+              </object>
+			  <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTable" id="p300-speller-table-target-result">
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">3</property>
+            <property name="column_spacing">4</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <object class="GtkLabel" id="label-result">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="single_line_mode">True</property>
+              </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">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label-target">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label-result-title">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Result :</property>
+                <property name="single_line_mode">True</property>
+              </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_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label-target-title">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Target :</property>
+                <property name="single_line_mode">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-select-font</property>
+              </object>
+              <packing>
+                <property name="bottom_attach">2</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="top_attach">2</property>
+            <property name="bottom_attach">3</property>
+            <property name="y_options">GTK_FILL</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHSeparator" id="hseparator">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="top_attach">1</property>
+            <property name="bottom_attach">2</property>
+            <property name="x_options">GTK_FILL</property>
+            <property name="y_options">GTK_FILL</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="p300-speller-toolbar">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes">P300 Speller</property>
+    <property name="type_hint">dialog</property>
+    <child>
+      <object class="GtkToolbar" id="toolbar">
+        <property name="width_request">640</property>
+        <property name="visible">True</property>
+        <property name="toolbar_style">both</property>
+        <child>
+          <object class="GtkToggleToolButton" id="toolbutton-show_target_text">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Show Target Text</property>
+            <property name="stock_id">gtk-info</property>
+            <property name="active">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton" id="toolbutton-show_result_text">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Show Result Text</property>
+            <property name="stock_id">gtk-info</property>
+            <property name="active">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>