diff --git a/data/resources/ui/confirm_quit_popup.ui b/data/resources/ui/confirm_quit_popup.ui
index baae963..75d77fa 100644
--- a/data/resources/ui/confirm_quit_popup.ui
+++ b/data/resources/ui/confirm_quit_popup.ui
@@ -4,7 +4,6 @@
   <requires lib="libadwaita" version="1.0"/>
   <template class="ConfirmQuitPopup" parent="AdwWindow">
     <property name="destroy-with-parent">True</property>
-    <property name="type-hint">dialog</property>
     <property name="content">
       <object class="GtkWindowHandle">
         <child>
@@ -29,9 +28,9 @@
                 <property name="justify">center</property>
                 <property name="wrap">1</property>
                 <property name="max-width-chars">45</property>
-                <attributes>
-                  <attribute name="weight" value="bold"></attribute>
-                </attributes>
+                <style>
+                  <class name="title-2"/>
+                </style>
               </object>
             </child>
             <child>
diff --git a/data/resources/ui/main_window.ui b/data/resources/ui/main_window.ui
index 65e5e1b..45d9086 100644
--- a/data/resources/ui/main_window.ui
+++ b/data/resources/ui/main_window.ui
@@ -100,9 +100,6 @@
             <child>
               <object class="GtkStack" id="main_stack">
                 <property name="transition-type">slide-left-right</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
           </object>
diff --git a/data/resources/ui/pages/confirm.ui b/data/resources/ui/pages/confirm.ui
index bda17b5..0c1f3e6 100644
--- a/data/resources/ui/pages/confirm.ui
+++ b/data/resources/ui/pages/confirm.ui
@@ -15,18 +15,18 @@
           <object class="GtkLabel">
             <property name="label" translatable="1" comments="Followed by a disk or partition name">This will delete all data on</property>
             <property name="wrap">1</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
+            <style>
+              <class name="title-2"/>
+            </style>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="disk_label">
             <property name="wrap">1</property>
             <property name="wrap-mode">word-char</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
+            <style>
+              <class name="title-3"/>
+            </style>
           </object>
         </child>
       </object>
diff --git a/data/resources/ui/pages/disk.ui b/data/resources/ui/pages/disk.ui
index 330122c..ce1bb75 100644
--- a/data/resources/ui/pages/disk.ui
+++ b/data/resources/ui/pages/disk.ui
@@ -17,9 +17,9 @@
                     <property name="label" translatable="1" comments="Explanation for disk selection page.">Select Drive for Installation</property>
                     <property name="justify">center</property>
                     <property name="wrap">1</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                    </attributes>
+                    <style>
+                      <class name="title-2"/>
+                    </style>
                   </object>
                 </child>
                 <child type="end">
@@ -51,9 +51,9 @@
               <object class="GtkLabel" id="disk_label">
                 <property name="justify">center</property>
                 <property name="wrap">1</property>
-                <attributes>
-                  <attribute name="weight" value="bold"></attribute>
-                </attributes>
+                <style>
+                  <class name="title-2"/>
+                </style>
               </object>
             </property>
           </object>
@@ -125,9 +125,9 @@
                                             <property name="width-chars">5</property>
                                             <property name="max-width-chars">7</property>
                                             <property name="xalign">1</property>
-                                            <attributes>
-                                              <attribute name="weight" value="light"></attribute>
-                                            </attributes>
+                                            <style>
+                                              <class name="dim-label"/>
+                                            </style>
                                           </object>
                                         </child>
                                         <child>
@@ -141,9 +141,6 @@
                                                 <property name="label" translatable="1" comments="Label to go back to overview of all disks">Use Whole Disk</property>
                                                 <property name="wrap">1</property>
                                                 <property name="xalign">0</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="normal"></attribute>
-                                                </attributes>
                                               </object>
                                             </child>
                                             <child>
@@ -152,9 +149,9 @@
                                                 <property name="width-chars">5</property>
                                                 <property name="max-width-chars">7</property>
                                                 <property name="xalign">0</property>
-                                                <attributes>
-                                                  <attribute name="weight" value="light"></attribute>
-                                                </attributes>
+                                                <style>
+                                                  <class name="dim-label"/>
+                                                </style>
                                               </object>
                                             </child>
                                           </object>
diff --git a/data/resources/ui/pages/done.ui b/data/resources/ui/pages/done.ui
index ebfad0d..33bbe07 100644
--- a/data/resources/ui/pages/done.ui
+++ b/data/resources/ui/pages/done.ui
@@ -12,9 +12,9 @@
         <child>
           <object class="GtkLabel">
             <property name="label" translatable="1" comments="Informative label after successful installation">Installation complete</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
+            <style>
+              <class name="title-2"/>
+            </style>
           </object>
         </child>
         <child>
diff --git a/data/resources/ui/pages/failed.ui b/data/resources/ui/pages/failed.ui
index 972a255..d30f3ef 100644
--- a/data/resources/ui/pages/failed.ui
+++ b/data/resources/ui/pages/failed.ui
@@ -13,9 +13,9 @@
         <property name="justify">center</property>
         <property name="wrap">1</property>
         <property name="max-width-chars">50</property>
-        <attributes>
-          <attribute name="weight" value="bold"></attribute>
-        </attributes>
+        <style>
+          <class name="title-2"/>
+        </style>
       </object>
     </child>
     <child>
diff --git a/data/resources/ui/pages/install.ui b/data/resources/ui/pages/install.ui
index 70b9ca9..8fe739c 100644
--- a/data/resources/ui/pages/install.ui
+++ b/data/resources/ui/pages/install.ui
@@ -13,9 +13,9 @@
         <child>
           <object class="GtkLabel">
             <property name="label" translatable="1" comments="Simple label used during Installation">Installing</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
+            <style>
+              <class name="title-2"/>
+            </style>
           </object>
         </child>
         <child>
diff --git a/data/resources/ui/pages/keyboard_layout.ui b/data/resources/ui/pages/keyboard_layout.ui
index 653aab2..4f3bcfb 100644
--- a/data/resources/ui/pages/keyboard_layout.ui
+++ b/data/resources/ui/pages/keyboard_layout.ui
@@ -10,9 +10,9 @@
         <property name="label" translatable="1" comments="Explanation for keyboard layout selection page.">Select Keyboard Layout</property>
         <property name="justify">center</property>
         <property name="wrap">1</property>
-        <attributes>
-          <attribute name="weight" value="bold"></attribute>
-        </attributes>
+        <style>
+          <class name="title-2"/>
+        </style>
       </object>
     </child>
     <child>
diff --git a/data/resources/ui/pages/language.ui b/data/resources/ui/pages/language.ui
index 1d9faa6..d7e29c9 100644
--- a/data/resources/ui/pages/language.ui
+++ b/data/resources/ui/pages/language.ui
@@ -65,9 +65,6 @@
         <property name="height-request">64</property>
         <property name="valign">end</property>
         <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
         <style>
           <class name="bottom-gradient"/>
         </style>
diff --git a/data/resources/ui/pages/locale.ui b/data/resources/ui/pages/locale.ui
index 2b89b9a..14489fd 100644
--- a/data/resources/ui/pages/locale.ui
+++ b/data/resources/ui/pages/locale.ui
@@ -20,9 +20,9 @@
                     <property name="label" translatable="1" comments="Above list of continents and countries">Adapt to Location</property>
                     <property name="justify">center</property>
                     <property name="wrap">1</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"></attribute>
-                    </attributes>
+                    <style>
+                      <class name="title-2"/>
+                    </style>
                   </object>
                 </child>
                 <child>
@@ -106,9 +106,9 @@
                                 <property name="wrap">1</property>
                                 <property name="max-width-chars">60</property>
                                 <property name="xalign">0</property>
-                                <attributes>
-                                  <attribute name="weight" value="light"></attribute>
-                                </attributes>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
                               </object>
                             </child>
                           </object>
@@ -161,9 +161,9 @@
                             <property name="label" translatable="1" comments="Above list of continents and countries">Select Location</property>
                             <property name="justify">center</property>
                             <property name="wrap">1</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"></attribute>
-                            </attributes>
+                            <style>
+                              <class name="title-2"/>
+                            </style>
                           </object>
                         </property>
                       </object>
@@ -177,9 +177,9 @@
                             <property name="label" translatable="1" comments="Above list of format locales">Select Region</property>
                             <property name="justify">center</property>
                             <property name="wrap">1</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"></attribute>
-                            </attributes>
+                            <style>
+                              <class name="title-2"/>
+                            </style>
                           </object>
                         </property>
                       </object>
diff --git a/data/resources/ui/pages/restart.ui b/data/resources/ui/pages/restart.ui
index 76cdd0b..55ad8ef 100644
--- a/data/resources/ui/pages/restart.ui
+++ b/data/resources/ui/pages/restart.ui
@@ -15,9 +15,9 @@
           <object class="GtkLabel">
             <property name="vexpand">1</property>
             <property name="label" translatable="1" comments="Shown when restarting system after installation.">Restarting</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
+            <style>
+              <class name="title-2"/>
+            </style>
           </object>
         </child>
         <child>
diff --git a/data/resources/ui/pages/software.ui b/data/resources/ui/pages/software.ui
index 86ae8cc..a3282e9 100644
--- a/data/resources/ui/pages/software.ui
+++ b/data/resources/ui/pages/software.ui
@@ -10,9 +10,9 @@
         <property name="label" translatable="1" comments="Informative label above a list of software that can be selected for installation">Select Additional Software to Install</property>
         <property name="justify">center</property>
         <property name="wrap">1</property>
-        <attributes>
-          <attribute name="weight" value="bold"></attribute>
-        </attributes>
+        <style>
+          <class name="title-2"/>
+        </style>
       </object>
     </child>
     <child>
diff --git a/data/resources/ui/pages/user.ui b/data/resources/ui/pages/user.ui
index 4e91525..78d01fe 100644
--- a/data/resources/ui/pages/user.ui
+++ b/data/resources/ui/pages/user.ui
@@ -10,9 +10,9 @@
         <property name="label" translatable="1" comments="Explanation for disk selection page.">Enter Account Information</property>
         <property name="justify">center</property>
         <property name="wrap">1</property>
-        <attributes>
-          <attribute name="weight" value="bold"></attribute>
-        </attributes>
+        <style>
+          <class name="title-2"/>
+        </style>
       </object>
     </child>
     <child>
diff --git a/data/resources/ui/widgets/device_row.ui b/data/resources/ui/widgets/device_row.ui
index 5896728..640a3ad 100644
--- a/data/resources/ui/widgets/device_row.ui
+++ b/data/resources/ui/widgets/device_row.ui
@@ -33,9 +33,9 @@
                     <property name="label" translatable="1" comments="Shown for partitions that are not big enough to be installed on">Not enough space for installation</property>
                     <property name="wrap">1</property>
                     <property name="xalign">1</property>
-                    <attributes>
-                      <attribute name="weight" value="light"></attribute>
-                    </attributes>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                 </property>
               </object>
@@ -104,9 +104,9 @@
             <property name="valign">start</property>
             <property name="ellipsize">start</property>
             <property name="xalign">0</property>
-            <attributes>
-              <attribute name="weight" value="light"></attribute>
-            </attributes>
+            <style>
+              <class name="dim-label"/>
+            </style>
             <layout>
               <property name="column">1</property>
               <property name="row">1</property>
@@ -118,9 +118,9 @@
             <property name="width-chars">5</property>
             <property name="max-width-chars">7</property>
             <property name="xalign">1</property>
-            <attributes>
-              <attribute name="weight" value="light"></attribute>
-            </attributes>
+            <style>
+              <class name="dim-label"/>
+            </style>
             <layout>
               <property name="column">0</property>
               <property name="row">0</property>
diff --git a/data/resources/ui/widgets/no_partitions_row.ui b/data/resources/ui/widgets/no_partitions_row.ui
index a5ff11c..ddee930 100644
--- a/data/resources/ui/widgets/no_partitions_row.ui
+++ b/data/resources/ui/widgets/no_partitions_row.ui
@@ -33,9 +33,6 @@
                 <property name="label" translatable="1" comments="Followed by a list of requirements">The disk requires:</property>
                 <property name="wrap">1</property>
                 <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="light"></attribute>
-                </attributes>
               </object>
             </child>
             <child>
@@ -51,9 +48,6 @@
   • EFI partition</property>
                         <property name="wrap">1</property>
                         <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="light"></attribute>
-                        </attributes>
                       </object>
                     </property>
                   </object>
@@ -66,9 +60,6 @@
                         <property name="label" translatable="1" comments="Technical terms, the abbreviations should not be translated">  • BIOS boot partition</property>
                         <property name="wrap">1</property>
                         <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="light"></attribute>
-                        </attributes>
                       </object>
                     </property>
                   </object>
diff --git a/data/resources/ui/widgets/software_row.ui b/data/resources/ui/widgets/software_row.ui
index ff26ecd..ea2aae9 100644
--- a/data/resources/ui/widgets/software_row.ui
+++ b/data/resources/ui/widgets/software_row.ui
@@ -29,9 +29,9 @@
                 <property name="valign">end</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"></attribute>
-                </attributes>
+                <style>
+                  <class name="title-2"/>
+                </style>
               </object>
             </child>
             <child>