Converted layout files to XML.

10 files changed, 654 insertions, 527 deletions

diff --git a/data/layouts/scan/Makefile.am b/data/layouts/scan/Makefile.am
index 6fb66fd..39f7fce 100644
--- a/data/layouts/scan/Makefile.am
+++ b/data/layouts/scan/Makefile.am
@@ -1,6 +1,6 @@
 scanlayoutsdir = $(datadir)/caribou/layouts/scan
 
 scanlayouts_DATA = \
-    us.json
+    us.xml
 
 EXTRA_DIST = $(scanlayouts_DATA)
diff --git a/data/layouts/scan/us.json b/data/layouts/scan/us.json
deleted file mode 100644
index b020abc..0000000
--- a/data/layouts/scan/us.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "level1" : {
-       "mode" : "default",
-       "rows" : [
-          [[{"name" : "Caribou_Repeat"},
-            {"name" : "space"},
-            {"name" : "a"},
-            {"name" : "b"},
-            {"name" : "c"}],
-           [{"name" : "d"},
-            {"name" : "e"},
-            {"name" : "f"},
-            {"name" : "g"},
-            {"name" : "h"}],
-           [{"name" : "i"},
-            {"name" : "j"},
-            {"name" : "k"},
-            {"name" : "l"},
-            {"name" : "m"}]],
-          [[{"name" : "Return"},
-            {"name" : "Caribou_ShiftUp"},
-            {"name" : "n"},
-            {"name" : "o"},
-            {"name" : "p"}],
-           [{"name" : "q"},
-            {"name" : "r"},
-            {"name" : "s"},
-            {"name" : "t"},
-            {"name" : "u"}],
-           [{"name" : "v"},
-            {"name" : "w"},
-            {"name" : "x"},
-            {"name" : "y"},
-            {"name" : "z"}]],
-          [[{"name" :"period"},
-            {"name" : "comma"},
-            {"name" : "at"},
-            {"name" : "numbersign"},
-            {"name" : "dollar"}],
-           [{"name" : "percent"},
-            {"name" : "ampersand"},
-            {"name" : "asterisk"},
-            {"name" : "parenleft"},
-            {"name" : "parenright"}],
-           [{"name" : "minus"},
-            {"name" : "plus"},
-            {"name" : "equal"},
-            {"name" : "quotedbl"},
-            {"name" : "apostrophe"}]],
-          [[{"name" : "grave"},
-            {"name" : "asciitilde"},
-            {"name" : "underscore"},
-            {"name" : "colon"},
-            {"name" : "semicolon"}],
-           [{"name" : "backslash"},
-            {"name" : "bar"},
-            {"name" : "bracketleft"},
-            {"name" : "bracketright"},
-            {"name" : "braceleft"}],
-           [{"name" : "braceright"},
-            {"name" : "_"},
-            {"name" : "_"},
-            {"name" : "_"},
-            {"name" : "Caribou_Prefs"}]]
-       ]
-    }
-}
diff --git a/data/layouts/scan/us.xml b/data/layouts/scan/us.xml
new file mode 100644
index 0000000..b83a22f
--- /dev/null
+++ b/data/layouts/scan/us.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<layout>
+  <level mode="default" name="level1">
+    <row>
+      <column>
+        <key name="Caribou_Repeat"/>
+        <key name="space"/>
+        <key name="a"/>
+        <key name="b"/>
+        <key name="c"/>
+      </column>
+      <column>
+        <key name="d"/>
+        <key name="e"/>
+        <key name="f"/>
+        <key name="g"/>
+        <key name="h"/>
+      </column>
+      <column>
+        <key name="i"/>
+        <key name="j"/>
+        <key name="k"/>
+        <key name="l"/>
+        <key name="m"/>
+      </column>
+    </row>
+    <row>
+      <column>
+        <key name="Return"/>
+        <key name="Caribou_ShiftUp"/>
+        <key name="n"/>
+        <key name="o"/>
+        <key name="p"/>
+      </column>
+      <column>
+        <key name="q"/>
+        <key name="r"/>
+        <key name="s"/>
+        <key name="t"/>
+        <key name="u"/>
+      </column>
+      <column>
+        <key name="v"/>
+        <key name="w"/>
+        <key name="x"/>
+        <key name="y"/>
+        <key name="z"/>
+      </column>
+    </row>
+    <row>
+      <column>
+        <key name="period"/>
+        <key name="comma"/>
+        <key name="at"/>
+        <key name="numbersign"/>
+        <key name="dollar"/>
+      </column>
+      <column>
+        <key name="percent"/>
+        <key name="ampersand"/>
+        <key name="asterisk"/>
+        <key name="parenleft"/>
+        <key name="parenright"/>
+      </column>
+      <column>
+        <key name="minus"/>
+        <key name="plus"/>
+        <key name="equal"/>
+        <key name="quotedbl"/>
+        <key name="apostrophe"/>
+      </column>
+    </row>
+    <row>
+      <column>
+        <key name="grave"/>
+        <key name="asciitilde"/>
+        <key name="underscore"/>
+        <key name="colon"/>
+        <key name="semicolon"/>
+      </column>
+      <column>
+        <key name="backslash"/>
+        <key name="bar"/>
+        <key name="bracketleft"/>
+        <key name="bracketright"/>
+        <key name="braceleft"/>
+      </column>
+      <column>
+        <key name="braceright"/>
+        <key name="_"/>
+        <key name="_"/>
+        <key name="_"/>
+        <key name="Caribou_Prefs"/>
+      </column>
+    </row>
+  </level>
+</layout>
+
diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am
index f18d728..6692fc0 100644
--- a/data/layouts/touch/Makefile.am
+++ b/data/layouts/touch/Makefile.am
@@ -1,8 +1,8 @@
 touchlayoutsdir = $(datadir)/caribou/layouts/touch
 
 touchlayouts_DATA = \
-    ara.json \
-    il.json \
-    us.json
+    ara.xml \
+    il.xml \
+    us.xml
 
 EXTRA_DIST = $(touchlayouts_DATA)
diff --git a/data/layouts/touch/ara.json b/data/layouts/touch/ara.json
deleted file mode 100644
index e757ee9..0000000
--- a/data/layouts/touch/ara.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-   "level1" : {
-      "mode" : "default",
-      "rows" : [
-         [{"name" : "Arabic_dad"},
-          {"name" : "Arabic_sad"},
-          {"name" : "Arabic_qaf"},
-          {"name" : "Arabic_feh"},
-          {"name" : "Arabic_ghain"},
-          {"name" : "Arabic_ain"},
-          {"name" : "Arabic_ha"},
-          {"name" : "Arabic_khah"},
-          {"name" : "Arabic_hah"},
-          {"name" : "Arabic_jeem"},
-          {"name" : "BackSpace"}],
-         [{"name" : "Arabic_sheen", "margin_left" : 0.5},
-          {"name" : "Arabic_seen"},
-          {"name" : "Arabic_yeh"},
-          {"name" : "Arabic_beh"},
-          {"name" : "Arabic_lam"},
-          {"name" : "Arabic_alef"},
-          {"name" : "Arabic_teh"},
-          {"name" : "Arabic_noon"},
-          {"name" : "Arabic_meem"},
-          {"name" : "Arabic_kaf"}],
-         [{"name" : "Arabic_zah"},
-          {"name" : "Arabic_tah"},
-          {"name" : "Arabic_thal"},
-          {"name" : "Arabic_dal"},
-          {"name" : "Arabic_zain"},
-          {"name" : "Arabic_ra"},
-          {"name" : "Arabic_waw"},
-          {"name" : "Arabic_tehmarbuta"},
-          {"name" : "Arabic_theh"},
-          {"name" : "Return", "width" : 2.0}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "Arabic_fathatan"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols1" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "Arabic_1"},
-          {"name" : "Arabic_2"},
-          {"name" : "Arabic_3"},
-          {"name" : "Arabic_4"},
-          {"name" : "Arabic_5"},
-          {"name" : "Arabic_6"},
-          {"name" : "Arabic_7"},
-          {"name" : "Arabic_8"},
-          {"name" : "Arabic_9"},
-          {"name" : "Arabic_0"},
-          {"name" : "BackSpace"}],
-         [{"name" : "minus", "margin_left" : 0.5},
-          {"name" : "slash"},
-          {"name" : "colon"},
-          {"name" : "Arabic_semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols_More", "width" : 2.0, "toggle" : "symbols2"},
-          {"name" : "period"},
-          {"name" : "Arabic_comma"},
-          {"name" : "Arabic_question_mark"},
-          {"name" : "slash"},
-          {"name" : "exclam"},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols2" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "Arabic_percent"},
-          {"name" : "bracketleft"},
-          {"name" : "bracketright"},
-          {"name" : "braceleft"},
-          {"name" : "braceright"},
-          {"name" : "backslash"},
-          {"name" : "plus"},
-          {"name" : "equal"},
-          {"name" : "grave"},
-          {"name" : "underscore"},
-          {"name" : "BackSpace"}],
-         [{"name" : "less", "margin_left" : 0.5},
-          {"name" : "greater"},
-          {"name" : "asterisk"},
-          {"name" : "semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "question"},
-          {"name" : "slash"},
-          {"name" : "exclam"},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   }
-}
diff --git a/data/layouts/touch/ara.xml b/data/layouts/touch/ara.xml
new file mode 100644
index 0000000..fc39a75
--- /dev/null
+++ b/data/layouts/touch/ara.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" ?>
+<layout>
+  <level mode="default" name="level1">
+    <row>
+      <key name="Arabic_dad"/>
+      <key name="Arabic_sad"/>
+      <key name="Arabic_qaf"/>
+      <key name="Arabic_feh"/>
+      <key name="Arabic_ghain"/>
+      <key name="Arabic_ain"/>
+      <key name="Arabic_ha"/>
+      <key name="Arabic_khah"/>
+      <key name="Arabic_hah"/>
+      <key name="Arabic_jeem"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="Arabic_sheen"/>
+      <key name="Arabic_seen"/>
+      <key name="Arabic_yeh"/>
+      <key name="Arabic_beh"/>
+      <key name="Arabic_lam"/>
+      <key name="Arabic_alef"/>
+      <key name="Arabic_teh"/>
+      <key name="Arabic_noon"/>
+      <key name="Arabic_meem"/>
+      <key name="Arabic_kaf"/>
+    </row>
+    <row>
+      <key name="Arabic_zah"/>
+      <key name="Arabic_tah"/>
+      <key name="Arabic_thal"/>
+      <key name="Arabic_dal"/>
+      <key name="Arabic_zain"/>
+      <key name="Arabic_ra"/>
+      <key name="Arabic_waw"/>
+      <key name="Arabic_tehmarbuta"/>
+      <key name="Arabic_theh"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="Arabic_fathatan"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols1">
+    <row>
+      <key name="Arabic_1"/>
+      <key name="Arabic_2"/>
+      <key name="Arabic_3"/>
+      <key name="Arabic_4"/>
+      <key name="Arabic_5"/>
+      <key name="Arabic_6"/>
+      <key name="Arabic_7"/>
+      <key name="Arabic_8"/>
+      <key name="Arabic_9"/>
+      <key name="Arabic_0"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="minus"/>
+      <key name="slash"/>
+      <key name="colon"/>
+      <key name="Arabic_semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols_More" toggle="symbols2" width="2.0"/>
+      <key name="period"/>
+      <key name="Arabic_comma"/>
+      <key name="Arabic_question_mark"/>
+      <key name="slash"/>
+      <key name="exclam"/>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols2">
+    <row>
+      <key name="Arabic_percent"/>
+      <key name="bracketleft"/>
+      <key name="bracketright"/>
+      <key name="braceleft"/>
+      <key name="braceright"/>
+      <key name="backslash"/>
+      <key name="plus"/>
+      <key name="equal"/>
+      <key name="grave"/>
+      <key name="underscore"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="less"/>
+      <key name="greater"/>
+      <key name="asterisk"/>
+      <key name="semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="question"/>
+      <key name="slash"/>
+      <key name="exclam"/>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+</layout>
+
diff --git a/data/layouts/touch/il.json b/data/layouts/touch/il.json
deleted file mode 100644
index b0939ed..0000000
--- a/data/layouts/touch/il.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-   "level1" : {
-      "mode" : "default",
-      "rows" : [
-         [{"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "hebrew_qoph"},
-          {"name" : "hebrew_resh"},
-          {"name" : "hebrew_aleph"},
-          {"name" : "hebrew_tet"},
-          {"name" : "hebrew_waw"},
-          {"name" : "hebrew_finalnun"},
-          {"name" : "hebrew_finalmem"},
-          {"name" : "hebrew_pe"},
-          {"name" : "BackSpace"}],
-         [{"name" : "hebrew_shin", "margin_left" : 0.5},
-          {"name" : "hebrew_dalet"},
-          {"name" : "hebrew_gimel"},
-          {"name" : "hebrew_kaph"},
-          {"name" : "hebrew_ayin"},
-          {"name" : "hebrew_yod"},
-          {"name" : "hebrew_chet"},
-          {"name" : "hebrew_lamed"},
-          {"name" : "hebrew_finalkaph"},
-          {"name" : "hebrew_finalpe"}],
-         [{"name" : "hebrew_zain"},
-          {"name" : "hebrew_samech"},
-          {"name" : "hebrew_bet"},
-          {"name" : "hebrew_he"},
-          {"name" : "hebrew_nun"},
-          {"name" : "hebrew_mem"},
-          {"name" : "hebrew_zade"},
-          {"name" : "hebrew_taw"},
-          {"name" : "hebrew_finalzade"},
-          {"name" : "Return", "width" : 2.0}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols1" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "1"},
-          {"name" : "2"},
-          {"name" : "3"},
-          {"name" : "4"},
-          {"name" : "5"},
-          {"name" : "6"},
-          {"name" : "7"},
-          {"name" : "8"},
-          {"name" : "9"},
-          {"name" : "0"},
-          {"name" : "BackSpace"}],
-         [{"name" : "minus", "margin_left" : 0.5},
-          {"name" : "slash"},
-          {"name" : "colon"},
-          {"name" : "semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols_More", "width" : 2.0, "toggle" : "symbols2"},
-          {"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "question"},
-          {"name" : "slash"},
-          {"name" : "exclam"},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols2" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "percent"},
-          {"name" : "bracketleft"},
-          {"name" : "bracketright"},
-          {"name" : "braceleft"},
-          {"name" : "braceright"},
-          {"name" : "backslash"},
-          {"name" : "plus"},
-          {"name" : "equal"},
-          {"name" : "grave"},
-          {"name" : "underscore"},
-          {"name" : "BackSpace"}],
-         [{"name" : "less", "margin_left" : 0.5},
-          {"name" : "greater"},
-          {"name" : "asterisk"},
-          {"name" : "semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "question"},
-          {"name" : "slash"},
-          {"name" : "exclam"},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   }
-}
diff --git a/data/layouts/touch/il.xml b/data/layouts/touch/il.xml
new file mode 100644
index 0000000..524040c
--- /dev/null
+++ b/data/layouts/touch/il.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" ?>
+<layout>
+  <level mode="default" name="level1">
+    <row>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="hebrew_qoph"/>
+      <key name="hebrew_resh"/>
+      <key name="hebrew_aleph"/>
+      <key name="hebrew_tet"/>
+      <key name="hebrew_waw"/>
+      <key name="hebrew_finalnun"/>
+      <key name="hebrew_finalmem"/>
+      <key name="hebrew_pe"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="hebrew_shin"/>
+      <key name="hebrew_dalet"/>
+      <key name="hebrew_gimel"/>
+      <key name="hebrew_kaph"/>
+      <key name="hebrew_ayin"/>
+      <key name="hebrew_yod"/>
+      <key name="hebrew_chet"/>
+      <key name="hebrew_lamed"/>
+      <key name="hebrew_finalkaph"/>
+      <key name="hebrew_finalpe"/>
+    </row>
+    <row>
+      <key name="hebrew_zain"/>
+      <key name="hebrew_samech"/>
+      <key name="hebrew_bet"/>
+      <key name="hebrew_he"/>
+      <key name="hebrew_nun"/>
+      <key name="hebrew_mem"/>
+      <key name="hebrew_zade"/>
+      <key name="hebrew_taw"/>
+      <key name="hebrew_finalzade"/>
+      <key name="Return" width="2.0"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols1">
+    <row>
+      <key name="1"/>
+      <key name="2"/>
+      <key name="3"/>
+      <key name="4"/>
+      <key name="5"/>
+      <key name="6"/>
+      <key name="7"/>
+      <key name="8"/>
+      <key name="9"/>
+      <key name="0"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="minus"/>
+      <key name="slash"/>
+      <key name="colon"/>
+      <key name="semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols_More" toggle="symbols2" width="2.0"/>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="question"/>
+      <key name="slash"/>
+      <key name="exclam"/>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols2">
+    <row>
+      <key name="percent"/>
+      <key name="bracketleft"/>
+      <key name="bracketright"/>
+      <key name="braceleft"/>
+      <key name="braceright"/>
+      <key name="backslash"/>
+      <key name="plus"/>
+      <key name="equal"/>
+      <key name="grave"/>
+      <key name="underscore"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="less"/>
+      <key name="greater"/>
+      <key name="asterisk"/>
+      <key name="semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="question"/>
+      <key name="slash"/>
+      <key name="exclam"/>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+</layout>
+
diff --git a/data/layouts/touch/us.json b/data/layouts/touch/us.json
deleted file mode 100644
index 20fcf04..0000000
--- a/data/layouts/touch/us.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-   "level1" : {
-      "mode" : "default",
-      "rows" : [
-         [{"name" : "q"},
-          {"name" : "w"},
-          {"name" : "e", "extended_names" : ["egrave",
-                                             "eacute",
-                                             "ecircumflex",
-                                             "ediaeresis",
-                                             "emacron"]},
-          {"name" : "r"},
-          {"name" : "t"},
-          {"name" : "y"},
-          {"name" : "u", "extended_names" : ["ugrave",
-                                             "uacute",
-                                             "ucircumflex",
-                                             "udiaeresis",
-                                             "umacron"]},
-          {"name" : "i", "extended_names" : ["igrave",
-                                             "iacute",
-                                             "icircumflex",
-                                             "idiaeresis",
-                                             "imacron"]},
-          {"name" : "o", "extended_names" : ["ograve",
-                                             "oacute",
-                                             "ocircumflex",
-                                             "odiaeresis",
-                                             "omacron"]},
-          {"name" : "p"},
-          {"name" : "BackSpace"}],
-         [{"name" : "a", "extended_names" : ["agrave",
-                                             "aacute",
-                                             "acircumflex",
-                                             "adiaeresis",
-                                             "aring",
-                                             "atilde",
-                                             "ae",
-                                             "amacron"],
-           "margin_left" : 0.5},
-          {"name" : "s"},
-          {"name" : "d"},
-          {"name" : "f"},
-          {"name" : "g"},
-          {"name" : "h"},
-          {"name" : "j"},
-          {"name" : "k"},
-          {"name" : "l"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_ShiftUp", "toggle" : "level2"},
-          {"name" : "z"},
-          {"name" : "x"},
-          {"name" : "c", "extended_names" : ["ccedilla"]},
-          {"name" : "v"},
-          {"name" : "b"},
-          {"name" : "n"},
-          {"name" : "m"},
-          {"name" : "comma"},
-          {"name" : "period"},
-          {"name" : "question"}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "level2" : {
-      "mode" : "latched",
-      "rows" : [
-         [{"name" : "Q"},
-          {"name" : "W"},
-          {"name" : "E", "extended_names" : ["Egrave",
-                                             "Eacute",
-                                             "Ecircumflex",
-                                             "Ediaeresis",
-                                             "Emacron"]},
-          {"name" : "R"},
-          {"name" : "T"},
-          {"name" : "Y"},
-          {"name" : "U", "extended_names" : ["Ugrave",
-                                             "Uacute",
-                                             "Ucircumflex",
-                                             "Udiaeresis",
-                                             "Umacron"]},
-          {"name" : "I", "extended_names" : ["Igrave",
-                                             "Iacute",
-                                             "Icircumflex",
-                                             "Idiaeresis",
-                                             "Imacron"]},
-          {"name" : "O", "extended_names" : ["Ograve",
-                                             "Oacute",
-                                             "Ocircumflex",
-                                             "Odiaeresis",
-                                             "Omacron"]},
-          {"name" : "P"},
-          {"name" : "BackSpace"}],
-         [{"name" : "A", "extended_names" : ["Agrave",
-                                             "Aacute",
-                                             "Acircumflex",
-                                             "Adiaeresis",
-                                             "Aring",
-                                             "Atilde",
-                                             "Ae",
-                                             "Amacron"],
-           "margin_left" : 0.5},
-          {"name" : "S"},
-          {"name" : "D"},
-          {"name" : "F"},
-          {"name" : "G"},
-          {"name" : "H"},
-          {"name" : "J"},
-          {"name" : "K"},
-          {"name" : "L"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_ShiftDown", "toggle" : "level1"},
-          {"name" : "Z"},
-          {"name" : "X"},
-          {"name" : "C", "extended_names" : ["Ccedilla"]},
-          {"name" : "V"},
-          {"name" : "B"},
-          {"name" : "N"},
-          {"name" : "M"},
-          {"name" : "comma"},
-          {"name" : "period"},
-          {"name" : "question"}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols1" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "1"},
-          {"name" : "2"},
-          {"name" : "3"},
-          {"name" : "4"},
-          {"name" : "5"},
-          {"name" : "6"},
-          {"name" : "7"},
-          {"name" : "8"},
-          {"name" : "9"},
-          {"name" : "0"},
-          {"name" : "BackSpace"}],
-         [{"name" : "minus", "margin_left" : 0.5},
-          {"name" : "slash"},
-          {"name" : "colon"},
-          {"name" : "semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols_More", "width" : 2.0, "toggle" : "symbols2"},
-          {"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "question", "extended_names" : ["questiondown"]},
-          {"name" : "slash"},
-          {"name" : "exclam", "extended_names" : ["exclamdown"]},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   },
-   "symbols2" : {
-      "mode" : "locked",
-      "rows" : [
-         [{"name" : "percent"},
-          {"name" : "bracketleft"},
-          {"name" : "bracketright"},
-          {"name" : "braceleft"},
-          {"name" : "braceright"},
-          {"name" : "backslash"},
-          {"name" : "plus"},
-          {"name" : "equal"},
-          {"name" : "grave"},
-          {"name" : "underscore"},
-          {"name" : "BackSpace"}],
-         [{"name" : "less", "margin_left" : 0.5},
-          {"name" : "greater"},
-          {"name" : "asterisk"},
-          {"name" : "semicolon"},
-          {"name" : "parenleft"},
-          {"name" : "parenright"},
-          {"name" : "dollar"},
-          {"name" : "ampersand"},
-          {"name" : "at"},
-          {"name" : "Return", "width" : 1.5}],
-         [{"name" : "Caribou_Symbols", "width" : 2.0, "toggle" : "symbols1"},
-          {"name" : "period"},
-          {"name" : "comma"},
-          {"name" : "question"},
-          {"name" : "slash"},
-          {"name" : "exclam"},
-          {"name" : "apostrophe"},
-          {"name" : "quotedbl"},
-          {"name" : "bar"},
-          {"name" : "numbersign"}],
-         [{"name" : "Caribou_Alpha", "width" : 2.0, "toggle" : "default"},
-          {"name" : "Caribou_Emoticons"},
-          {"name" : "space", "width" : 5.0},
-          {"name" : "Caribou_Prefs", "margin_left" : 2.0}]
-      ]
-   }
-}
diff --git a/data/layouts/touch/us.xml b/data/layouts/touch/us.xml
new file mode 100644
index 0000000..0a9aaca
--- /dev/null
+++ b/data/layouts/touch/us.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" ?>
+<layout>
+  <level mode="default" name="level1">
+    <row>
+      <key name="q"/>
+      <key name="w"/>
+      <key name="e">
+        <key name="e"/>
+        <key name="egrave"/>
+        <key name="eacute"/>
+        <key name="ecircumflex"/>
+        <key name="ediaeresis"/>
+        <key name="emacron"/>
+      </key>
+      <key name="r"/>
+      <key name="t"/>
+      <key name="y"/>
+      <key name="u">
+        <key name="u"/>
+        <key name="ugrave"/>
+        <key name="uacute"/>
+        <key name="ucircumflex"/>
+        <key name="udiaeresis"/>
+        <key name="umacron"/>
+      </key>
+      <key name="i">
+        <key name="i"/>
+        <key name="igrave"/>
+        <key name="iacute"/>
+        <key name="icircumflex"/>
+        <key name="idiaeresis"/>
+        <key name="imacron"/>
+      </key>
+      <key name="o">
+        <key name="o"/>
+        <key name="ograve"/>
+        <key name="oacute"/>
+        <key name="ocircumflex"/>
+        <key name="odiaeresis"/>
+        <key name="omacron"/>
+      </key>
+      <key name="p"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="a">
+        <key name="a"/>
+        <key name="agrave"/>
+        <key name="aacute"/>
+        <key name="acircumflex"/>
+        <key name="adiaeresis"/>
+        <key name="aring"/>
+        <key name="atilde"/>
+        <key name="ae"/>
+        <key name="amacron"/>
+      </key>
+      <key name="s"/>
+      <key name="d"/>
+      <key name="f"/>
+      <key name="g"/>
+      <key name="h"/>
+      <key name="j"/>
+      <key name="k"/>
+      <key name="l"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftUp" toggle="level2"/>
+      <key name="z"/>
+      <key name="x"/>
+      <key name="c">
+        <key name="c"/>
+        <key name="ccedilla"/>
+      </key>
+      <key name="v"/>
+      <key name="b"/>
+      <key name="n"/>
+      <key name="m"/>
+      <key name="comma"/>
+      <key name="period"/>
+      <key name="question"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="latched" name="level2">
+    <row>
+      <key name="Q"/>
+      <key name="W"/>
+      <key name="E">
+        <key name="E"/>
+        <key name="Egrave"/>
+        <key name="Eacute"/>
+        <key name="Ecircumflex"/>
+        <key name="Ediaeresis"/>
+        <key name="Emacron"/>
+      </key>
+      <key name="R"/>
+      <key name="T"/>
+      <key name="Y"/>
+      <key name="U">
+        <key name="U"/>
+        <key name="Ugrave"/>
+        <key name="Uacute"/>
+        <key name="Ucircumflex"/>
+        <key name="Udiaeresis"/>
+        <key name="Umacron"/>
+      </key>
+      <key name="I">
+        <key name="I"/>
+        <key name="Igrave"/>
+        <key name="Iacute"/>
+        <key name="Icircumflex"/>
+        <key name="Idiaeresis"/>
+        <key name="Imacron"/>
+      </key>
+      <key name="O">
+        <key name="O"/>
+        <key name="Ograve"/>
+        <key name="Oacute"/>
+        <key name="Ocircumflex"/>
+        <key name="Odiaeresis"/>
+        <key name="Omacron"/>
+      </key>
+      <key name="P"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="A">
+        <key name="A"/>
+        <key name="Agrave"/>
+        <key name="Aacute"/>
+        <key name="Acircumflex"/>
+        <key name="Adiaeresis"/>
+        <key name="Aring"/>
+        <key name="Atilde"/>
+        <key name="Ae"/>
+        <key name="Amacron"/>
+      </key>
+      <key name="S"/>
+      <key name="D"/>
+      <key name="F"/>
+      <key name="G"/>
+      <key name="H"/>
+      <key name="J"/>
+      <key name="K"/>
+      <key name="L"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_ShiftDown" toggle="level1"/>
+      <key name="Z"/>
+      <key name="X"/>
+      <key name="C">
+        <key name="C"/>
+        <key name="Ccedilla"/>
+      </key>
+      <key name="V"/>
+      <key name="B"/>
+      <key name="N"/>
+      <key name="M"/>
+      <key name="comma"/>
+      <key name="period"/>
+      <key name="question"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols1">
+    <row>
+      <key name="1"/>
+      <key name="2"/>
+      <key name="3"/>
+      <key name="4"/>
+      <key name="5"/>
+      <key name="6"/>
+      <key name="7"/>
+      <key name="8"/>
+      <key name="9"/>
+      <key name="0"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="minus"/>
+      <key name="slash"/>
+      <key name="colon"/>
+      <key name="semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols_More" toggle="symbols2" width="2.0"/>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="question">
+        <key name="question"/>
+        <key name="questiondown"/>
+      </key>
+      <key name="slash"/>
+      <key name="exclam">
+        <key name="exclam"/>
+        <key name="exclamdown"/>
+      </key>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+  <level mode="locked" name="symbols2">
+    <row>
+      <key name="percent"/>
+      <key name="bracketleft"/>
+      <key name="bracketright"/>
+      <key name="braceleft"/>
+      <key name="braceright"/>
+      <key name="backslash"/>
+      <key name="plus"/>
+      <key name="equal"/>
+      <key name="grave"/>
+      <key name="underscore"/>
+      <key name="BackSpace"/>
+    </row>
+    <row>
+      <key margin-left="0.5" name="less"/>
+      <key name="greater"/>
+      <key name="asterisk"/>
+      <key name="semicolon"/>
+      <key name="parenleft"/>
+      <key name="parenright"/>
+      <key name="dollar"/>
+      <key name="ampersand"/>
+      <key name="at"/>
+      <key name="Return" width="1.5"/>
+    </row>
+    <row>
+      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key name="period"/>
+      <key name="comma"/>
+      <key name="question"/>
+      <key name="slash"/>
+      <key name="exclam"/>
+      <key name="apostrophe"/>
+      <key name="quotedbl"/>
+      <key name="bar"/>
+      <key name="numbersign"/>
+    </row>
+    <row>
+      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key name="Caribou_Emoticons"/>
+      <key name="space" width="5.0"/>
+      <key margin-left="2.0" name="Caribou_Prefs"/>
+    </row>
+  </level>
+</layout>
+