diff --git a/data/keyboards/geometry/extended.xml b/data/keyboards/geometry/extended.xml
index 3646ff04..34545431 100644
--- a/data/keyboards/geometry/extended.xml
+++ b/data/keyboards/geometry/extended.xml
@@ -1,58 +1,7 @@
 <?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" />
-      <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 name="AD11" 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" />
-      <key name="AC06" oref="outline2" />
-      <key name="AC07" oref="outline2" />
-      <key name="AC08" oref="outline2" />
-      <key name="AC09" oref="outline2" />
-      <key name="AC10" oref="outline2" />
-      <key name="AC11" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <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" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="0" name="ABC123" oref="altline" />
-      <key name="I149" oref="altline" />
-      <key name="SPCE" oref="spaceline" />
-      <key name="AB08" oref="outline2" />
-      <key name="RTRN" oref="outline7" />
-    </row>
-  </section>
+
   <outline id="outline2" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="32" y="0.000000"/>
@@ -119,4 +68,38 @@
     <point x="150.5853" y="52"/>
     <point x="0.000000" y="52"/>
   </outline>
+
+  <button name="Shift_L" oref="altline" />
+  <button name="BackSpace" oref="altline" />
+  <button name="preferences" oref="altline" />
+  <button name="show_numbers" oref="altline" keycode="0" />
+  <button name="show_letters" oref="altline" keycode="0" />
+  <button name="show_symbols" oref="altline" keycode="0" />
+  <button name="space" oref="spaceline" />
+  <button name="return" oref="outline7" />
+
+  <view>
+    <section angle="0">q w e r t y u i o p aring</section>
+    <section angle="0">a s d f g h j k l oslash ae</section>
+    <section angle="0"> Shift_L   z x c v b n m  BackSpace </section>
+    <section angle="0"> show_numbers preferences         space        period    Return    </section>
+  </view>
+  <view>
+    <section angle="0">Q W E R T Y U I O P Aring</section>
+    <section angle="0">A S D F G H J K L Oslash AE</section>
+    <section angle="0"> Shift_L   Z X C V B N M  BackSpace </section>
+    <section angle="0"> show_numbers preferences         space        period    Return    </section>
+  </view>
+  <view>
+    <section angle="0">1 2 3 4 5 6 7 8 9 0</section>
+    <section angle="0">at numbersign dollar percent ampersand minus underscore plus parenleft parenright</section>
+    <section angle="0"> show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace </section>
+    <section angle="0"> show_letters preferences         space        period    Return    </section>
+  </view>
+  <view>
+    <section angle="0">asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph</section>
+    <section angle="0">copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright</section>
+    <section angle="0"> show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace </section>
+    <section angle="0"> show_letters preferences         space        period    Return    </section>
+  </view>
 </geometry>
diff --git a/data/keyboards/symbols/nb.xml b/data/keyboards/symbols/nb.xml
index c8faf6b8..89238f52 100644
--- a/data/keyboards/symbols/nb.xml
+++ b/data/keyboards/symbols/nb.xml
@@ -1,5 +1,14 @@
-<?xml version='1.0' encoding='ASCII' standalone='yes'?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <symbols version="0.90">
+  <symbol label="*">asterisk</symbol>
+  <symbol label="+/=">show_symbols</symbol>
+  <symbol label="&#964;">Greek_tau</symbol>
+  <symbol label="å">aring</symbol>
+  <symbol label="ø">oslash</symbol>
+  <symbol label="æ">ae</symbol>
+  <symbol label="Å">Aring</symbol>
+  <symbol label="Ø">Oslash</symbol>
+  <symbol label="Æ">AE</symbol>
   <key name="AD01">
     <symbol label="q">q</symbol>
     <symbol label="Q">Q</symbol>
@@ -189,10 +198,10 @@
     <symbol label=".">period</symbol>
   </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>
+    <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>
   <key name="I149">
     <symbol icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>