diff --git a/data/keyboards/geometry/digits.xml b/data/keyboards/geometry/digits.xml
new file mode 100644
index 00000000..c2dc4df6
--- /dev/null
+++ b/data/keyboards/geometry/digits.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<geometry version="0.90">
+  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
+  <section angle="0">
+    <row orientation="1">
+      <key name="AD01" oref="outline4" />
+      <key name="AD02" oref="outline4" />
+      <key name="AD03" oref="outline4" />
+    </row>
+  </section>
+  <section angle="0">
+    <row orientation="1">
+      <key name="AC01" oref="outline4" />
+      <key name="AC02" oref="outline4" />
+      <key name="AC03" oref="outline4" />
+    </row>
+  </section>
+  <section angle="0">
+    <row orientation="1">
+      <key name="AB01" oref="outline4" />
+      <key name="AB02" oref="outline4" />
+      <key name="AB03" oref="outline4" />
+    </row>
+  </section>
+  <section angle="0">
+    <row orientation="1">
+      <key name="BKSP" oref="altline" />
+      <key name="AB04" oref="outline4" />
+      <key name="RTRN" oref="altline" />
+    </row>
+  </section>
+  <outline id="outline2" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="altline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="48.39024" y="0.000000"/>
+    <point x="48.39024" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline4" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline5" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline6" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="68.68292" y="0.000000"/>
+    <point x="68.68292" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline7" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline8" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline9" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="109.2682" y="0.000000"/>
+    <point x="109.2682" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline10" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline13" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="79.60975" y="0.000000"/>
+    <point x="79.60975" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="spaceline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="120.5853" y="0.000000"/>
+    <point x="120.5853" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+</geometry>
diff --git a/data/keyboards/geometry/phone-keypad.xml b/data/keyboards/geometry/phone-keypad.xml
new file mode 100644
index 00000000..2ce06a58
--- /dev/null
+++ b/data/keyboards/geometry/phone-keypad.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<geometry version="0.90">
+  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
+  <section angle="0">
+    <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" />
+    </row>
+  </section>
+  <section angle="0">
+    <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" />
+    </row>
+  </section>
+  <section angle="0">
+    <row orientation="1">
+      <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" />
+    </row>
+  </section>
+  <section angle="0">
+    <row orientation="1">
+      <key name="BKSP" oref="altline" />
+      <key name="AB06" oref="outline2" />
+      <key name="SPCE" oref="spaceline" />
+      <key name="RTRN" oref="outline7" />
+    </row>
+  </section>
+  <outline id="outline2" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="altline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="48.39024" y="0.000000"/>
+    <point x="48.39024" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline4" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline5" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="59.31707" y="0.000000"/>
+    <point x="59.31707" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline6" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="68.68292" y="0.000000"/>
+    <point x="68.68292" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline7" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline8" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="88.97561" y="0.000000"/>
+    <point x="88.97561" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline9" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="109.2682" y="0.000000"/>
+    <point x="109.2682" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline10" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="37.46341" y="0.000000"/>
+    <point x="37.46341" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="outline13" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="79.60975" y="0.000000"/>
+    <point x="79.60975" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+  <outline id="spaceline" corner-radius="1.000000">
+    <point x="0.000000" y="0.000000"/>
+    <point x="120.5853" y="0.000000"/>
+    <point x="120.5853" y="52.44877"/>
+    <point x="0.000000" y="52.44877"/>
+  </outline>
+</geometry>
diff --git a/data/keyboards/geometry/url.xml b/data/keyboards/geometry/url.xml
index 01240edb..1657586e 100644
--- a/data/keyboards/geometry/url.xml
+++ b/data/keyboards/geometry/url.xml
@@ -13,6 +13,12 @@
       <key name="AD08" oref="outline2" />
       <key name="AD09" oref="outline2" />
       <key name="AD10" oref="outline2" />
+      <key name="AE01" oref="outline6" />
+      <key name="AE02" oref="outline2" />
+      <key name="AE03" oref="outline6" />
+      <key name="AE04" oref="outline6" />
+      <key name="AE05" oref="outline6" />
+      <key name="AE06" oref="outline6" />
     </row>
   </section>
   <section angle="0">
diff --git a/data/keyboards/keyboards.xml b/data/keyboards/keyboards.xml
index b3fa5d7c..413b098a 100644
--- a/data/keyboards/keyboards.xml
+++ b/data/keyboards/keyboards.xml
@@ -90,11 +90,14 @@
 	    longname="Telugu (Inscript)" language="te"/>
 
   <!-- Common keyboards -->
+  <keyboard id="digits" name="digits"
+	    geometry="digits" symbols="special/digits"
+	    longname="Digits" language="all"/>
   <keyboard id="number" name="number"
 	    geometry="number-keypad" symbols="special/number"
 	    longname="Numeric keypad" language="all"/>
   <keyboard id="phone" name="phone"
-	    geometry="number-keypad" symbols="special/number"
+	    geometry="phone-keypad" symbols="special/phone"
 	    longname="Phone keypad" language="all"/>
   <keyboard id="url" name="url"
 	    geometry="url" symbols="special/url"
diff --git a/data/keyboards/symbols/special/digits.xml b/data/keyboards/symbols/special/digits.xml
new file mode 100644
index 00000000..18db8ec5
--- /dev/null
+++ b/data/keyboards/symbols/special/digits.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='ASCII' standalone='yes'?>
+<symbols version="0.90">
+  <key name="AD01">
+    <symbol label="1">1</symbol>
+  </key>
+  <key name="AD02">
+    <symbol label="2">2</symbol>
+  </key>
+  <key name="AD03">
+    <symbol label="3">3</symbol>
+  </key>
+  <key name="AC01">
+    <symbol label="4">4</symbol>
+  </key>
+  <key name="AC02">
+    <symbol label="5">5</symbol>
+  </key>
+  <key name="AC03">
+    <symbol label="6">6</symbol>
+  </key>
+  <key name="AB01">
+    <symbol label="7">7</symbol>
+  </key>
+  <key name="AB02">
+    <symbol label="8">8</symbol>
+  </key>
+  <key name="AB03">
+    <symbol label="9">9</symbol>
+  </key>
+  <key name="AB04">
+    <symbol label="0">0</symbol>
+  </key>
+  <key name="RTRN">
+    <symbol keyval="65293" icon="key-enter">Return</symbol>
+  </key>
+  <key name="BKSP">
+    <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
+  </key>
+</symbols>
diff --git a/data/keyboards/symbols/special/number.xml b/data/keyboards/symbols/special/number.xml
index dc688d9f..8dbe3cdf 100644
--- a/data/keyboards/symbols/special/number.xml
+++ b/data/keyboards/symbols/special/number.xml
@@ -10,10 +10,10 @@
     <symbol label="3">3</symbol>
   </key>
   <key name="AD04">
-    <symbol label="(">parenleft</symbol>
+    <symbol label=".">period</symbol>
   </key>
   <key name="AD05">
-    <symbol label=")">parenright</symbol>
+    <symbol label=",">comma</symbol>
   </key>
   <key name="AC01">
     <symbol label="4">4</symbol>
@@ -25,7 +25,7 @@
     <symbol label="6">6</symbol>
   </key>
   <key name="AC04">
-    <symbol label="#">numbersign</symbol>
+    <symbol label="/">slash</symbol>
   </key>
   <key name="AC05">
     <symbol label="*">asterisk</symbol>
diff --git a/data/keyboards/symbols/special/phone.xml b/data/keyboards/symbols/special/phone.xml
new file mode 100644
index 00000000..dc688d9f
--- /dev/null
+++ b/data/keyboards/symbols/special/phone.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='ASCII' standalone='yes'?>
+<symbols version="0.90">
+  <key name="AD01">
+    <symbol label="1">1</symbol>
+  </key>
+  <key name="AD02">
+    <symbol label="2">2</symbol>
+  </key>
+  <key name="AD03">
+    <symbol label="3">3</symbol>
+  </key>
+  <key name="AD04">
+    <symbol label="(">parenleft</symbol>
+  </key>
+  <key name="AD05">
+    <symbol label=")">parenright</symbol>
+  </key>
+  <key name="AC01">
+    <symbol label="4">4</symbol>
+  </key>
+  <key name="AC02">
+    <symbol label="5">5</symbol>
+  </key>
+  <key name="AC03">
+    <symbol label="6">6</symbol>
+  </key>
+  <key name="AC04">
+    <symbol label="#">numbersign</symbol>
+  </key>
+  <key name="AC05">
+    <symbol label="*">asterisk</symbol>
+  </key>
+  <key name="AB01">
+    <symbol label="7">7</symbol>
+  </key>
+  <key name="AB02">
+    <symbol label="8">8</symbol>
+  </key>
+  <key name="AB03">
+    <symbol label="9">9</symbol>
+  </key>
+  <key name="AB04">
+    <symbol label="+">plus</symbol>
+  </key>
+  <key name="AB05">
+    <symbol label="-">minus</symbol>
+  </key>
+  <key name="AB06">
+    <symbol label="0">0</symbol>
+  </key>
+  <key name="RTRN">
+    <symbol keyval="65293" icon="key-enter">Return</symbol>
+  </key>
+  <key name="SPCE">
+    <symbol label=" ">space</symbol>
+  </key>
+  <key name="BKSP">
+    <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
+  </key>
+</symbols>
diff --git a/data/keyboards/symbols/special/url.xml b/data/keyboards/symbols/special/url.xml
index 541d42a9..08719429 100644
--- a/data/keyboards/symbols/special/url.xml
+++ b/data/keyboards/symbols/special/url.xml
@@ -3,68 +3,68 @@
   <key name="AD01">
     <symbol label="q">q</symbol>
     <symbol label="Q">Q</symbol>
+    <symbol label=""></symbol>
     <symbol label="1">1</symbol>
-    <text label="https://">https://</text>
   </key>
   <key name="AD02">
     <symbol label="w">w</symbol>
     <symbol label="W">W</symbol>
+    <symbol label=""></symbol>
     <symbol label="2">2</symbol>
-    <symbol label="`">quoteleft</symbol>
   </key>
   <key name="AD03">
     <symbol label="e">e</symbol>
     <symbol label="E">E</symbol>
+    <symbol label=""></symbol>
     <symbol label="3">3</symbol>
-    <symbol label="|">bar</symbol>
   </key>
   <key name="AD04">
     <symbol label="r">r</symbol>
     <symbol label="R">R</symbol>
+    <symbol label=""></symbol>
     <symbol label="4">4</symbol>
-    <symbol label="&#183;">U00B7</symbol>
   </key>
   <key name="AD05">
     <symbol label="t">t</symbol>
     <symbol label="T">T</symbol>
+    <symbol label=""></symbol>
     <symbol label="5">5</symbol>
-    <symbol label="&#8730;">squareroot</symbol>
   </key>
   <key name="AD06">
     <symbol label="y">y</symbol>
     <symbol label="Y">Y</symbol>
+    <symbol label=""></symbol>
     <symbol label="6">6</symbol>
-    <symbol label="&#960;">Greek_pi</symbol>
   </key>
   <key name="AD07">
     <symbol label="u">u</symbol>
     <symbol label="U">U</symbol>
+    <symbol label=""></symbol>
     <symbol label="7">7</symbol>
-    <symbol label="&#247;">division</symbol>
   </key>
   <key name="AD08">
     <symbol label="i">i</symbol>
     <symbol label="I">I</symbol>
+    <symbol label=""></symbol>
     <symbol label="8">8</symbol>
-    <symbol label="&#215;">multiply</symbol>
   </key>
   <key name="AD09">
     <symbol label="o">o</symbol>
     <symbol label="O">O</symbol>
+    <symbol label=""></symbol>
     <symbol label="9">9</symbol>
-    <symbol label="&#182;">paragraph</symbol>
   </key>
   <key name="AD10">
     <symbol label="p">p</symbol>
     <symbol label="P">P</symbol>
+    <symbol label=""></symbol>
     <symbol label="0">0</symbol>
-    <symbol label="&#9651;">U25B3</symbol>
   </key>
   <key name="AC01">
     <symbol label="a">a</symbol>
     <symbol label="A">A</symbol>
     <symbol label="@">at</symbol>
-    <symbol label="&#169;">copyright</symbol>
+    <symbol label="~">asciitilde</symbol>
   </key>
   <key name="AC02">
     <symbol label="s">s</symbol>
@@ -126,8 +126,8 @@
   <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="URL">Shift_L</keysym>
     <keysym keyval="65505" label="123">Shift_L</keysym>
+    <keysym keyval="65505" label="URL">Shift_L</keysym>
   </key>
   <key name="AB01">
     <symbol label="z">z</symbol>
@@ -175,8 +175,8 @@
     <symbol label=".">period</symbol>
   </key>
   <key name="ABC123">
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="123">show-numbers</symbol>
+    <symbol label="URL">show-url</symbol>
+    <symbol label="URL">show-url</symbol>
     <symbol label="ABC">show-letters</symbol>
     <symbol label="ABC">show-letters</symbol>
   </key>
@@ -189,4 +189,43 @@
   <key name="BKSP">
     <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
   </key>
+
+<!-- Extra URL mode buttons -->
+  <key name="AE01">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label="https">https</text>
+    <symbol label=""></symbol>
+  </key>
+  <key name="AE02">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label="://">://</text>
+    <symbol label=""></symbol>
+  </key>
+  <key name="AE03">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label="www.">www.</text>
+    <symbol label=""></symbol>
+  </key>
+  <key name="AE04">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label=".com">.com</text>
+    <symbol label=""></symbol>
+  </key>
+  <key name="AE05">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label=".org">.org</text>
+    <symbol label=""></symbol>
+  </key>
+  <key name="AE06">
+    <symbol label=""></symbol>
+    <symbol label=""></symbol>
+    <text label=".net">.net</text>
+    <symbol label=""></symbol>
+  </key>
+
 </symbols>
diff --git a/data/squeekboard.gresources.xml b/data/squeekboard.gresources.xml
index e2c7cc95..d9c3f805 100644
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@@ -2,11 +2,19 @@
 <gresources>
   <gresource prefix="/sm/puri/squeekboard">
    <file compressed="true">style.css</file>
+
+<!-- Keyboard layouts -->
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/digits.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/number-keypad.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/phone-keypad.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/url.xml</file>
+
+<!-- Keyboard definitions -->
    <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
+
+<!-- Natural language keyboards -->
    <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>
@@ -36,8 +44,13 @@
    <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>
+
+<!-- Special purpose keyboards -->
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/digits.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/number.xml</file>
+   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/phone.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/url.xml</file>
+
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>