From 074773ba71ac5a2536a5791f646ff0f7af4cdd43 Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Thu, 31 May 2018 18:39:57 +0200
Subject: UI: drop all deprecated elements

---
 data/buttons-programming.ui | 1202 +++++++++++++------------------------------
 1 file changed, 368 insertions(+), 834 deletions(-)

(limited to 'data/buttons-programming.ui')

diff --git a/data/buttons-programming.ui b/data/buttons-programming.ui
index 4b24bbd..c596b51 100644
--- a/data/buttons-programming.ui
+++ b/data/buttons-programming.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.22"/>
   <object class="GtkDialog" id="character_code_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -10,12 +10,16 @@
     <property name="type_hint">dialog</property>
     <signal name="delete-event" handler="character_code_dialog_delete_cb" swapped="no"/>
     <signal name="response" handler="character_code_dialog_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -26,7 +30,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -42,7 +45,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -60,7 +62,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox21">
+          <object class="GtkBox" id="hbox21">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">5</property>
@@ -86,8 +88,6 @@
                 <property name="invisible_char">●</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">True</property>
-                <property name="secondary_icon_sensitive">True</property>
                 <signal name="activate" handler="character_code_dialog_activate_cb" swapped="no"/>
               </object>
               <packing>
@@ -113,12 +113,16 @@
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="button_panel">
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox" id="button_panel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -138,8 +142,8 @@
               <object class="GtkLabel" id="base_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
                 <property name="label" comments="Example content">FF₁₆ 256₁₀</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -161,11 +165,9 @@
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
-              <object class="GtkTable" id="bit_table">
+              <object class="GtkGrid" id="bit_table">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">4</property>
-                <property name="n_columns">39</property>
                 <child>
                   <object class="GtkEventBox" id="bit_eventbox_1">
                     <property name="visible">True</property>
@@ -175,16 +177,14 @@
                       <object class="GtkLabel" id="bit_label_1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -196,16 +196,14 @@
                       <object class="GtkLabel" id="bit_label_2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -217,16 +215,14 @@
                       <object class="GtkLabel" id="bit_label_3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
-                    <property name="right_attach">4</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -238,16 +234,14 @@
                       <object class="GtkLabel" id="bit_label_4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">5</property>
-                    <property name="right_attach">6</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -259,16 +253,14 @@
                       <object class="GtkLabel" id="bit_label_5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">6</property>
-                    <property name="right_attach">7</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -280,16 +272,14 @@
                       <object class="GtkLabel" id="bit_label_6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">7</property>
-                    <property name="right_attach">8</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -301,16 +291,14 @@
                       <object class="GtkLabel" id="bit_label_7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">8</property>
-                    <property name="right_attach">9</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -322,16 +310,14 @@
                       <object class="GtkLabel" id="bit_label_8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">10</property>
-                    <property name="right_attach">11</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -343,16 +329,14 @@
                       <object class="GtkLabel" id="bit_label_9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">11</property>
-                    <property name="right_attach">12</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -364,16 +348,14 @@
                       <object class="GtkLabel" id="bit_label_10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">12</property>
-                    <property name="right_attach">13</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -385,16 +367,14 @@
                       <object class="GtkLabel" id="bit_label_11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">13</property>
-                    <property name="right_attach">14</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -406,16 +386,14 @@
                       <object class="GtkLabel" id="bit_label_12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">15</property>
-                    <property name="right_attach">16</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -427,16 +405,14 @@
                       <object class="GtkLabel" id="bit_label_13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">16</property>
-                    <property name="right_attach">17</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -448,16 +424,14 @@
                       <object class="GtkLabel" id="bit_label_14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">17</property>
-                    <property name="right_attach">18</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -469,16 +443,14 @@
                       <object class="GtkLabel" id="bit_label_15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">18</property>
-                    <property name="right_attach">19</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -490,16 +462,14 @@
                       <object class="GtkLabel" id="bit_label_31">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">38</property>
-                    <property name="right_attach">39</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -511,16 +481,14 @@
                       <object class="GtkLabel" id="bit_label_30">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">37</property>
-                    <property name="right_attach">38</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -532,16 +500,14 @@
                       <object class="GtkLabel" id="bit_label_29">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">36</property>
-                    <property name="right_attach">37</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -553,16 +519,14 @@
                       <object class="GtkLabel" id="bit_label_28">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">35</property>
-                    <property name="right_attach">36</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -574,16 +538,14 @@
                       <object class="GtkLabel" id="bit_label_27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">33</property>
-                    <property name="right_attach">34</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -595,16 +557,14 @@
                       <object class="GtkLabel" id="bit_label_26">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">32</property>
-                    <property name="right_attach">33</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -616,16 +576,14 @@
                       <object class="GtkLabel" id="bit_label_25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">31</property>
-                    <property name="right_attach">32</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -637,16 +595,14 @@
                       <object class="GtkLabel" id="bit_label_24">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">30</property>
-                    <property name="right_attach">31</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -658,16 +614,14 @@
                       <object class="GtkLabel" id="bit_label_23">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">28</property>
-                    <property name="right_attach">29</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -679,16 +633,14 @@
                       <object class="GtkLabel" id="bit_label_22">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">27</property>
-                    <property name="right_attach">28</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -700,16 +652,14 @@
                       <object class="GtkLabel" id="bit_label_21">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">26</property>
-                    <property name="right_attach">27</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -721,16 +671,14 @@
                       <object class="GtkLabel" id="bit_label_20">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">25</property>
-                    <property name="right_attach">26</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -742,16 +690,14 @@
                       <object class="GtkLabel" id="bit_label_19">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">23</property>
-                    <property name="right_attach">24</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -763,16 +709,14 @@
                       <object class="GtkLabel" id="bit_label_18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">22</property>
-                    <property name="right_attach">23</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -784,16 +728,14 @@
                       <object class="GtkLabel" id="bit_label_17">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">21</property>
-                    <property name="right_attach">22</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -805,101 +747,40 @@
                       <object class="GtkLabel" id="bit_label_16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">20</property>
-                    <property name="right_attach">21</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="bit_marker_label0">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label">63</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="bit_maker_label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label">31</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bit_marker_label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">32</property>
                     <property name="justify">center</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">38</property>
-                    <property name="right_attach">39</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bit_marker_label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">0</property>
                     <property name="justify">center</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">38</property>
-                    <property name="right_attach">39</property>
                     <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEventBox" id="bit_eventbox_32">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <signal name="button-press-event" handler="bit_toggle_cb" swapped="no"/>
-                    <child>
-                      <object class="GtkLabel" id="bit_label_32">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label"> 0</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -911,18 +792,14 @@
                       <object class="GtkLabel" id="bit_label_33">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -934,18 +811,14 @@
                       <object class="GtkLabel" id="bit_label_34">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -957,18 +830,14 @@
                       <object class="GtkLabel" id="bit_label_35">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
-                    <property name="right_attach">4</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -980,18 +849,14 @@
                       <object class="GtkLabel" id="bit_label_36">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">5</property>
-                    <property name="right_attach">6</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1003,18 +868,14 @@
                       <object class="GtkLabel" id="bit_label_37">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">6</property>
-                    <property name="right_attach">7</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1026,18 +887,14 @@
                       <object class="GtkLabel" id="bit_label_38">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">7</property>
-                    <property name="right_attach">8</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1049,18 +906,14 @@
                       <object class="GtkLabel" id="bit_label_39">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">8</property>
-                    <property name="right_attach">9</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1072,18 +925,14 @@
                       <object class="GtkLabel" id="bit_label_40">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">10</property>
-                    <property name="right_attach">11</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1095,18 +944,14 @@
                       <object class="GtkLabel" id="bit_label_41">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">11</property>
-                    <property name="right_attach">12</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1118,18 +963,14 @@
                       <object class="GtkLabel" id="bit_label_42">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">12</property>
-                    <property name="right_attach">13</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1141,18 +982,14 @@
                       <object class="GtkLabel" id="bit_label_43">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">13</property>
-                    <property name="right_attach">14</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1164,18 +1001,14 @@
                       <object class="GtkLabel" id="bit_label_44">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">15</property>
-                    <property name="right_attach">16</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1187,18 +1020,14 @@
                       <object class="GtkLabel" id="bit_label_45">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">16</property>
-                    <property name="right_attach">17</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1210,18 +1039,14 @@
                       <object class="GtkLabel" id="bit_label_46">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">17</property>
-                    <property name="right_attach">18</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1233,18 +1058,14 @@
                       <object class="GtkLabel" id="bit_label_47">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">18</property>
-                    <property name="right_attach">19</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1256,18 +1077,14 @@
                       <object class="GtkLabel" id="bit_label_48">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">20</property>
-                    <property name="right_attach">21</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1279,18 +1096,14 @@
                       <object class="GtkLabel" id="bit_label_49">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">21</property>
-                    <property name="right_attach">22</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1302,18 +1115,14 @@
                       <object class="GtkLabel" id="bit_label_50">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">22</property>
-                    <property name="right_attach">23</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1325,18 +1134,14 @@
                       <object class="GtkLabel" id="bit_label_51">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">23</property>
-                    <property name="right_attach">24</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1348,18 +1153,14 @@
                       <object class="GtkLabel" id="bit_label_52">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">25</property>
-                    <property name="right_attach">26</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1371,18 +1172,14 @@
                       <object class="GtkLabel" id="bit_label_53">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">26</property>
-                    <property name="right_attach">27</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1394,18 +1191,14 @@
                       <object class="GtkLabel" id="bit_label_54">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">27</property>
-                    <property name="right_attach">28</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1417,18 +1210,14 @@
                       <object class="GtkLabel" id="bit_label_55">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">28</property>
-                    <property name="right_attach">29</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1440,18 +1229,14 @@
                       <object class="GtkLabel" id="bit_label_56">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">30</property>
-                    <property name="right_attach">31</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1463,18 +1248,14 @@
                       <object class="GtkLabel" id="bit_label_57">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">31</property>
-                    <property name="right_attach">32</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1486,18 +1267,14 @@
                       <object class="GtkLabel" id="bit_label_58">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">32</property>
-                    <property name="right_attach">33</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1509,18 +1286,14 @@
                       <object class="GtkLabel" id="bit_label_59">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">33</property>
-                    <property name="right_attach">34</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1532,18 +1305,14 @@
                       <object class="GtkLabel" id="bit_label_60">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">35</property>
-                    <property name="right_attach">36</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1555,18 +1324,14 @@
                       <object class="GtkLabel" id="bit_label_61">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">36</property>
-                    <property name="right_attach">37</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1578,18 +1343,14 @@
                       <object class="GtkLabel" id="bit_label_62">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">37</property>
-                    <property name="right_attach">38</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1601,262 +1362,208 @@
                       <object class="GtkLabel" id="bit_label_63">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">38</property>
-                    <property name="right_attach">39</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bit_marker_label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">47</property>
                     <property name="justify">center</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">20</property>
-                    <property name="right_attach">21</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bit_marker_label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">15</property>
                     <property name="justify">center</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">20</property>
-                    <property name="right_attach">21</property>
                     <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label25">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
-                    <property name="right_attach">5</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label26">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">9</property>
-                    <property name="right_attach">10</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label27">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">14</property>
-                    <property name="right_attach">15</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label28">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">19</property>
-                    <property name="right_attach">20</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label29">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">24</property>
-                    <property name="right_attach">25</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label30">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">29</property>
-                    <property name="right_attach">30</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label31">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">34</property>
-                    <property name="right_attach">35</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label32">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
-                    <property name="right_attach">5</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label33">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">9</property>
-                    <property name="right_attach">10</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label34">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">14</property>
-                    <property name="right_attach">15</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label35">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">19</property>
-                    <property name="right_attach">20</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label36">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">24</property>
-                    <property name="right_attach">25</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label37">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">29</property>
-                    <property name="right_attach">30</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label38">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">  </property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">34</property>
-                    <property name="right_attach">35</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -1868,14 +1575,59 @@
                       <object class="GtkLabel" id="bit_label_0">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="label"> 0</property>
                         <property name="xalign">0</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="bit_marker_label0">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">63</property>
+                    <property name="justify">center</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="bit_maker_label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">31</property>
+                    <property name="justify">center</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEventBox" id="bit_eventbox_32">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <signal name="button-press-event" handler="bit_toggle_cb" swapped="no"/>
+                    <child>
+                      <object class="GtkLabel" id="bit_label_32">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label"> 0</property>
+                        <property name="xalign">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="x_options">GTK_SHRINK</property>
-                    <property name="y_options"></property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                   </packing>
                 </child>
                 <child>
@@ -2104,30 +1856,24 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="advanced_panel">
+          <object class="GtkGrid" id="advanced_panel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">5</property>
-            <property name="n_columns">10</property>
-            <property name="homogeneous">True</property>
+            <property name="row_homogeneous">True</property>
+            <property name="column_homogeneous">True</property>
             <child>
               <object class="GtkButton" id="calc_root_button">
                 <property name="label">√</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">7</property>
-                <property name="right_attach">8</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2135,18 +1881,13 @@
                 <property name="label">log</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">7</property>
-                <property name="right_attach">8</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2154,24 +1895,19 @@
                 <property name="label">fact</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
+                <signal name="clicked" handler="factorize_cb" swapped="no"/>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="calc_factor_button-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the factorize button">Factorize</property>
                   </object>
                 </child>
-                <signal name="clicked" handler="factorize_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">7</property>
-                <property name="right_attach">8</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2179,34 +1915,23 @@
                 <property name="label">ln</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">8</property>
-                <property name="right_attach">9</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_abs_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_abs_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the absolute value button">Absolute Value</property>
-                  </object>
-                </child>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
                 <child>
                   <object class="GtkLabel" id="label1">
@@ -2216,14 +1941,15 @@
                     <property name="use_markup">True</property>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_abs_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the absolute value button">Absolute Value</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2231,19 +1957,14 @@
                 <property name="label">int</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2251,19 +1972,14 @@
                 <property name="label">frac</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2271,38 +1987,14 @@
                 <property name="label">÷</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">4</property>
-                <property name="right_attach">5</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="calc_0_button">
-                <property name="label">0</property>
-                <property name="width_request">50</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="digit_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2310,19 +2002,14 @@
                 <property name="label">×</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">4</property>
-                <property name="right_attach">5</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2330,19 +2017,14 @@
                 <property name="label">−</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="subtract_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">4</property>
-                <property name="right_attach">5</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2350,19 +2032,14 @@
                 <property name="label">+</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">4</property>
-                <property name="right_attach">5</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2370,19 +2047,14 @@
                 <property name="label" translatable="yes" comments="Label on the solve button (clicking this solves the displayed calculation)">=</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="solve_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">6</property>
-                <property name="right_attach">7</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2390,19 +2062,14 @@
                 <property name="label" translatable="yes">Clear</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="clear_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">6</property>
-                <property name="right_attach">7</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2410,19 +2077,14 @@
                 <property name="label">1</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2430,19 +2092,14 @@
                 <property name="label">2</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2450,37 +2107,14 @@
                 <property name="label">3</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="calc_4_button">
-                <property name="label">4</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="digit_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2488,19 +2122,14 @@
                 <property name="label">5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2508,19 +2137,14 @@
                 <property name="label">6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2528,37 +2152,14 @@
                 <property name="label">7</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="calc_8_button">
-                <property name="label">8</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="digit_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2566,19 +2167,14 @@
                 <property name="label">9</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2586,19 +2182,14 @@
                 <property name="label">A</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2606,37 +2197,14 @@
                 <property name="label">B</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="calc_12_button">
-                <property name="label">C</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
-                <signal name="clicked" handler="digit_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2644,19 +2212,14 @@
                 <property name="label">D</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </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_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2664,19 +2227,14 @@
                 <property name="label">E</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </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="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2684,75 +2242,40 @@
                 <property name="label">F</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="digit_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton" id="calc_subscript_button">
+              <object class="GtkToggleButton" id="calc_superscript_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_subscript_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the subscript mode button">Subscript</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="set_subscript_cb" swapped="no"/>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="set_superscript_cb" swapped="no"/>
                 <child>
-                  <object class="GtkLabel" id="label4">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label">↓n</property>
+                    <property name="label">↑n</property>
                     <property name="use_markup">True</property>
                   </object>
                 </child>
-              </object>
-              <packing>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="calc_superscript_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="focus_on_click">False</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="calc_superscript_button-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the superscript mode button">Superscript</property>
                   </object>
                 </child>
-                <signal name="clicked" handler="set_superscript_cb" swapped="no"/>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">↑n</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -2760,34 +2283,25 @@
                 <property name="label" comments="Label is set in gtk.c to comply with LC flags">.</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="numeric_point_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_memory_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_memory_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the store value button">Store</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="memory_cb" swapped="no"/>
                 <child>
-                  <object class="GtkHBox" id="hbox20">
+                  <object class="GtkBox" id="hbox20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">3</property>
@@ -2817,12 +2331,15 @@
                     </child>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_memory_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the store value button">Store</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">3</property>
-                <property name="right_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -2830,19 +2347,14 @@
                 <property name="label">XOR</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2850,19 +2362,14 @@
                 <property name="label">OR</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2870,19 +2377,14 @@
                 <property name="label">AND</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2890,19 +2392,14 @@
                 <property name="label">mod</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -2910,17 +2407,14 @@
                 <property name="label">(</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">4</property>
-                <property name="right_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -2928,34 +2422,25 @@
                 <property name="label">)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">5</property>
-                <property name="right_attach">6</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_shift_left_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_shift_left_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the shift left button">Shift Left</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="shift_left_cb" swapped="no"/>
                 <child>
-                  <object class="GtkHBox" id="hbox11">
+                  <object class="GtkBox" id="hbox11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">3</property>
@@ -2985,29 +2470,26 @@
                     </child>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_shift_left_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the shift left button">Shift Left</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">6</property>
-                <property name="right_attach">7</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_shift_right_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_shift_right_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the shift right button">Shift Right</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="shift_right_cb" swapped="no"/>
                 <child>
-                  <object class="GtkHBox" id="hbox10">
+                  <object class="GtkBox" id="hbox10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">3</property>
@@ -3037,12 +2519,15 @@
                     </child>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_shift_right_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the shift right button">Shift Right</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">7</property>
-                <property name="right_attach">8</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -3050,21 +2535,18 @@
                 <property name="label">á</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="insert_character_code_cb" swapped="no"/>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="calc_character_button-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the insert character button">Insert Character</property>
                   </object>
                 </child>
-                <signal name="clicked" handler="insert_character_code_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">8</property>
-                <property name="right_attach">9</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -3072,33 +2554,22 @@
                 <property name="label">NOT</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">6</property>
-                <property name="right_attach">7</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_factorial_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_factorial_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the factorial button">Factorial</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
                 <child>
                   <object class="GtkLabel" id="label14">
@@ -3108,28 +2579,23 @@
                     <property name="use_markup">True</property>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_factorial_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the factorial button">Factorial</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">8</property>
-                <property name="right_attach">9</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_inverse_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_inverse_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the inverse button">Inverse</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
                 <child>
                   <object class="GtkLabel" id="label20">
@@ -3140,28 +2606,23 @@
                     <property name="justify">center</property>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_inverse_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the inverse button">Inverse</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">9</property>
-                <property name="right_attach">10</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="calc_x_pow_y_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="focus_on_click">False</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="calc_x_pow_y_button-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the exponentiation (x to the power of y) button">Exponent</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
                 <child>
                   <object class="GtkLabel" id="x_pow_y_label">
@@ -3171,14 +2632,15 @@
                     <property name="use_markup">True</property>
                   </object>
                 </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_x_pow_y_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the exponentiation (x to the power of y) button">Exponent</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">8</property>
-                <property name="right_attach">9</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -3186,19 +2648,14 @@
                 <property name="label">ones</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">6</property>
-                <property name="right_attach">7</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -3206,19 +2663,14 @@
                 <property name="label">twos</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">7</property>
-                <property name="right_attach">8</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -3226,19 +2678,101 @@
                 <property name="label">trunc</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="focus_on_click">False</property>
                 <signal name="clicked" handler="button_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">8</property>
-                <property name="right_attach">9</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="calc_subscript_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="set_subscript_cb" swapped="no"/>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">↓n</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="calc_subscript_button-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" comments="Accessible name for the subscript mode button">Subscript</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="calc_12_button">
+                <property name="label">C</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="digit_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="calc_8_button">
+                <property name="label">8</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="digit_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="calc_4_button">
+                <property name="label">4</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="digit_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="calc_0_button">
+                <property name="label">0</property>
+                <property name="width_request">50</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="digit_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
             <child>
-- 
cgit v1.2.1