diff --git a/unite.pot b/unite.pot
index 5be6bac..b24cc48 100644
--- a/unite.pot
+++ b/unite.pot
@@ -3,194 +3,173 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR galen1423 <gnu.linux@zaclys.net>, 2020.
 #
-msgid ""
-msgstr ""
 "Project-Id-Version: Unite Shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-16 03:07+0300\n"
+"POT-Creation-Date: 2024-07-30 10:03+0300\n"
 "PO-Revision-Date: 2020-04-30 18:36+0200\n"
+"Last-Translator: \n"
 "Language-Team: \n"
+"Language: en_EN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
-"Last-Translator: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Language: en_EN\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: unite@hardpixel.eu\n"
 "X-Poedit-SearchPath-0: settings.ui\n"
-"X-Poedit-SearchPath-1: overrides/settings.ui\n"
 
-#: overrides/settings.ui:38 settings.ui:32
-msgid "Extend top bar left box"
+#: settings.ui:11
+msgid "General"
 msgstr ""
 
-#: overrides/settings.ui:78 settings.ui:52
+#: settings.ui:32
 msgid "Auto focus new windows"
 msgstr ""
 
-#: overrides/settings.ui:118 settings.ui:72
+#: settings.ui:52
 msgid "Show system tray in top bar"
 msgstr ""
 
-#: overrides/settings.ui:158 settings.ui:92
+#: settings.ui:72
+msgid "Show appmenu in top bar"
+msgstr ""
+
+#: settings.ui:92
 msgid "Show desktop name in top bar"
 msgstr ""
 
-#: overrides/settings.ui:198 settings.ui:112
+#: settings.ui:112
 msgid "Enable titlebar actions on top bar click"
 msgstr ""
 
-#: overrides/settings.ui:238 settings.ui:132
+#: settings.ui:132
 msgid "Restrict functionalities to the primary screen"
 msgstr ""
 
-#: overrides/settings.ui:278 settings.ui:152
+#: settings.ui:152
 msgid "Hide activities button"
 msgstr ""
 
-#: overrides/settings.ui:294 overrides/settings.ui:339
-#: overrides/settings.ui:386 overrides/settings.ui:433 settings.ui:162
-#: settings.ui:187 settings.ui:214 settings.ui:241
+#: settings.ui:162 settings.ui:187 settings.ui:214 settings.ui:241
 msgid "Never"
 msgstr ""
 
-#: overrides/settings.ui:295 overrides/settings.ui:949
-#: overrides/settings.ui:996 settings.ui:163 settings.ui:521 settings.ui:548
+#: settings.ui:163 settings.ui:477 settings.ui:504
 msgid "Auto"
 msgstr ""
 
-#: overrides/settings.ui:296 overrides/settings.ui:343
-#: overrides/settings.ui:390 overrides/settings.ui:437 settings.ui:164
-#: settings.ui:191 settings.ui:218 settings.ui:245
+#: settings.ui:164 settings.ui:191 settings.ui:218 settings.ui:245
 msgid "Always"
 msgstr ""
 
-#: overrides/settings.ui:323 settings.ui:177
+#: settings.ui:177
 msgid "Hide window titlebars"
 msgstr ""
 
-#: overrides/settings.ui:340 overrides/settings.ui:387
-#: overrides/settings.ui:434 settings.ui:188 settings.ui:215 settings.ui:242
+#: settings.ui:188 settings.ui:215 settings.ui:242
 msgid "Tiled"
 msgstr ""
 
-#: overrides/settings.ui:341 overrides/settings.ui:388
-#: overrides/settings.ui:435 settings.ui:189 settings.ui:216 settings.ui:243
+#: settings.ui:189 settings.ui:216 settings.ui:243
 msgid "Maximized"
 msgstr ""
 
-#: overrides/settings.ui:342 overrides/settings.ui:389
-#: overrides/settings.ui:436 settings.ui:190 settings.ui:217 settings.ui:244
+#: settings.ui:190 settings.ui:217 settings.ui:244
 msgid "Both"
 msgstr ""
 
-#: overrides/settings.ui:370 settings.ui:204
+#: settings.ui:204
 msgid "Show window title in app menu"
 msgstr ""
 
-#: overrides/settings.ui:417 settings.ui:231
+#: settings.ui:231
 msgid "Show window buttons in top bar"
 msgstr ""
 
-#: overrides/settings.ui:464 settings.ui:258
+#: settings.ui:258
 msgid "Notification messages position"
 msgstr ""
 
-#: overrides/settings.ui:480 settings.ui:268
+#: settings.ui:268
 msgid "Center"
 msgstr ""
 
-#: overrides/settings.ui:481 overrides/settings.ui:950 settings.ui:269
-#: settings.ui:522
+#: settings.ui:269 settings.ui:478
 msgid "Left"
 msgstr ""
 
-#: overrides/settings.ui:482 overrides/settings.ui:951 settings.ui:270
-#: settings.ui:523
+#: settings.ui:270 settings.ui:479
 msgid "Right"
 msgstr ""
 
-#: overrides/settings.ui:506 settings.ui:282
-msgid "General"
-msgstr ""
-
-#: overrides/settings.ui:531 settings.ui:307
-msgid "Apply system fonts to shell theme"
-msgstr ""
-
-#: overrides/settings.ui:571 settings.ui:327
-msgid "Convert tray icons to greyscale"
+#: settings.ui:283
+msgid "Appearance"
 msgstr ""
 
-#: overrides/settings.ui:610 settings.ui:346
-msgid "Hide top bar dropdown arrows"
+#: settings.ui:304
+msgid "Extend top bar left box"
 msgstr ""
 
-#: overrides/settings.ui:650 settings.ui:367
-msgid "Hide aggregate menu dropdown arrow"
+#: settings.ui:324
+msgid "Use text in activities button"
 msgstr ""
 
-#: overrides/settings.ui:689 settings.ui:387
-msgid "Hide app menu dropdown arrow"
+#: settings.ui:344
+msgid "Convert tray icons to greyscale"
 msgstr ""
 
-#: overrides/settings.ui:729 settings.ui:407
+#: settings.ui:363
 msgid "Hide app menu application icon"
 msgstr ""
 
-#: overrides/settings.ui:769 settings.ui:427
+#: settings.ui:383
 msgid "Reduce top bar items spacing"
 msgstr ""
 
-#: overrides/settings.ui:809 settings.ui:447
+#: settings.ui:403
 msgid "Top bar desktop name text"
 msgstr ""
 
-#: overrides/settings.ui:823 settings.ui:455
+#: settings.ui:411
 msgid "GNOME Desktop"
 msgstr ""
 
-#: overrides/settings.ui:848 settings.ui:466
+#: settings.ui:422
 msgid "Max width for the app menu"
 msgstr ""
 
-#: overrides/settings.ui:888 settings.ui:486
+#: settings.ui:442
 msgid "Ellipsis mode for app menu"
 msgstr ""
 
-#: overrides/settings.ui:904 settings.ui:496
+#: settings.ui:452
 msgid "Start"
 msgstr ""
 
-#: overrides/settings.ui:905 settings.ui:497
+#: settings.ui:453
 msgid "Middle"
 msgstr ""
 
-#: overrides/settings.ui:906 settings.ui:498
+#: settings.ui:454
 msgid "End"
 msgstr ""
 
-#: overrides/settings.ui:933 settings.ui:511
+#: settings.ui:467
 msgid "Top bar window buttons position"
 msgstr ""
 
-#: overrides/settings.ui:952 settings.ui:524
+#: settings.ui:480
 msgid "First"
 msgstr ""
 
-#: overrides/settings.ui:953 settings.ui:525
+#: settings.ui:481
 msgid "Last"
 msgstr ""
 
-#: overrides/settings.ui:980 settings.ui:538
+#: settings.ui:494
 msgid "Top bar window buttons theme"
 msgstr ""
 
-#: overrides/settings.ui:997 settings.ui:549
+#: settings.ui:505
 msgid "Default"
 msgstr ""
-
-#: overrides/settings.ui:1021 settings.ui:561
-msgid "Appearance"
-msgstr ""
diff --git a/unite@hardpixel.eu/prefs.js b/unite@hardpixel.eu/prefs.js
index 83657f2..caffeb0 100644
--- a/unite@hardpixel.eu/prefs.js
+++ b/unite@hardpixel.eu/prefs.js
@@ -6,120 +6,92 @@ import { ExtensionPreferences } from 'resource:///org/gnome/Shell/Extensions/js/
 import * as Theme from './theme.js'
 import * as Convenience from './convenience.js'
 
-const PrefsWidget = GObject.registerClass(
-  class UnitePrefsWidget extends Gtk.Box {
-    _init(params) {
-      super._init(params)
-
-      this._settings  = Convenience.getSettings()
-      this._buildable = new Gtk.Builder()
-      this._themes    = new Theme.WindowControlsThemes()
-
-      this._loadTemplate()
-      this._loadThemes()
-
-      this._bindStrings()
-      this._bindSelects()
-      this._bindBooleans()
-      this._bindEnumerations()
-      this._bindIntegers()
-    }
-
-    _loadTemplate() {
-      const template = GLib.build_filenamev([Convenience.getPath(), 'settings.ui'])
-      this._buildable.add_from_file(template)
-
-      this._container = this._getWidget('prefs_widget')
-      this.append(this._container)
-    }
-
-    _loadThemes() {
-      const widget = this._getWidget('window-buttons-theme')
-      const themes = this._themes.available.sort((a, b) => {
-        return a.uuid < b.uuid ? -1 : a.uuid > b.uuid ? 1 : 0
-      })
-
-      themes.forEach(theme => {
-        if (theme.uuid !== 'default') {
-          widget.append(theme.uuid, theme.name)
-        }
-      })
-    }
-
-    _getWidget(name) {
-      let widgetName = name.replace(/-/g, '_')
-      return this._buildable.get_object(widgetName)
-    }
-
-    _bindInput(setting, prop) {
-      let widget = this._getWidget(setting)
-      this._settings.bind(setting, widget, prop, this._settings.DEFAULT_BINDING)
-    }
-
-    _bindEnum(setting) {
-      let widget = this._getWidget(setting)
-      widget.set_active(this._settings.get_enum(setting))
-
-      widget.connect('changed', combobox => {
-        this._settings.set_enum(setting, combobox.get_active())
-      })
-    }
-
-    _bindStrings() {
-      let settings = this._settings.getTypeSettings('string')
-      settings.forEach(setting => this._bindInput(setting, 'text'))
-    }
-
-    _bindSelects() {
-      let settings = this._settings.getTypeSettings('select')
-      settings.forEach(setting => this._bindInput(setting, 'active-id'))
-    }
-
-    _bindBooleans() {
-      let settings = this._settings.getTypeSettings('boolean')
-      settings.forEach(setting => this._bindInput(setting, 'active'))
-    }
-
-    _bindEnumerations() {
-      let settings = this._settings.getTypeSettings('enum')
-      settings.forEach(setting => this._bindEnum(setting))
-    }
-
-    _bindIntegers() {
-      let settings = this._settings.getTypeSettings('int')
-      settings.forEach(setting => this._bindInput(setting, 'value'))
-    }
+class UnitePreferencesWidget {
+  constructor() {
+    this._settings  = Convenience.getSettings()
+    this._buildable = new Gtk.Builder()
+    this._themes    = new Theme.WindowControlsThemes()
+
+    this._loadTemplate()
+    this._loadThemes()
+
+    this._bindStrings()
+    this._bindSelects()
+    this._bindBooleans()
+    this._bindEnumerations()
+    this._bindIntegers()
   }
-)
 
-export default class UnitePreferences extends ExtensionPreferences {
-  fillPreferencesWindow(window) {
-    const pages  = [
-      { name: 'general', icon: 'emblem-system-symbolic' },
-      { name: 'appearance', icon: 'emblem-photos-symbolic' }
-    ]
+  _loadTemplate() {
+    const template = GLib.build_filenamev([Convenience.getPath(), 'settings.ui'])
+    this._buildable.add_from_file(template)
+  }
 
-    const widget = new PrefsWidget()
+  _loadThemes() {
+    const widget = this._getWidget('window-buttons-theme')
+    const themes = this._themes.available.sort((a, b) => {
+      return a.uuid < b.uuid ? -1 : a.uuid > b.uuid ? 1 : 0
+    })
 
-    pages.forEach(({ name, icon }) => {
-      const page  = Adw.PreferencesPage.new()
-      const group = Adw.PreferencesGroup.new()
+    themes.forEach(theme => {
+      if (theme.uuid !== 'default') {
+        widget.append(theme.uuid, theme.name)
+      }
+    })
+  }
 
-      const label = widget._getWidget(`${name}_label`)
-      const prefs = widget._getWidget(`${name}_prefs`)
+  _getWidget(name) {
+    let widgetName = name.replace(/-/g, '_')
+    return this._buildable.get_object(widgetName)
+  }
 
-      page.set_name(name)
-      page.set_title(label.get_text())
-      page.set_icon_name(icon)
+  _bindInput(setting, prop) {
+    let widget = this._getWidget(setting)
+    this._settings.bind(setting, widget, prop, this._settings.DEFAULT_BINDING)
+  }
 
-      prefs.unparent()
-      group.add(prefs)
+  _bindEnum(setting) {
+    let widget = this._getWidget(setting)
+    widget.set_active(this._settings.get_enum(setting))
 
-      page.add(group)
-      window.add(page)
+    widget.connect('changed', combobox => {
+      this._settings.set_enum(setting, combobox.get_active())
     })
+  }
+
+  _bindStrings() {
+    let settings = this._settings.getTypeSettings('string')
+    settings.forEach(setting => this._bindInput(setting, 'text'))
+  }
+
+  _bindSelects() {
+    let settings = this._settings.getTypeSettings('select')
+    settings.forEach(setting => this._bindInput(setting, 'active-id'))
+  }
+
+  _bindBooleans() {
+    let settings = this._settings.getTypeSettings('boolean')
+    settings.forEach(setting => this._bindInput(setting, 'active'))
+  }
+
+  _bindEnumerations() {
+    let settings = this._settings.getTypeSettings('enum')
+    settings.forEach(setting => this._bindEnum(setting))
+  }
+
+  _bindIntegers() {
+    let settings = this._settings.getTypeSettings('int')
+    settings.forEach(setting => this._bindInput(setting, 'value'))
+  }
+}
+
+export default class UnitePreferences extends ExtensionPreferences {
+  fillPreferencesWindow(window) {
+    const widget = new UnitePreferencesWidget()
+
+    window.add(widget._getWidget('general_page'))
+    window.add(widget._getWidget('windows_page'))
 
-    window.set_default_size(620, 665)
-    widget.unrealize()
+    window.set_default_size(620, 660)
   }
 }
diff --git a/unite@hardpixel.eu/settings.ui b/unite@hardpixel.eu/settings.ui
index b6c43b5..11789b9 100644
--- a/unite@hardpixel.eu/settings.ui
+++ b/unite@hardpixel.eu/settings.ui
@@ -6,519 +6,385 @@
     <property name="step-increment">1</property>
     <property name="page-increment">10</property>
   </object>
-  <object class="GtkNotebook" id="prefs_widget">
-    <property name="hexpand">1</property>
-    <property name="show-border">0</property>
-    <property name="scrollable">1</property>
+  <object class="AdwPreferencesPage" id="general_page">
+    <property name="name">general-page</property>
+    <property name="title" translatable="yes">General</property>
+    <property name="icon-name">emblem-system-symbolic</property>
     <child>
-      <object class="GtkNotebookPage">
-        <property name="child">
-          <object class="GtkBox" id="general_prefs">
-            <property name="valign">start</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-top">20</property>
-            <property name="margin-bottom">20</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">15</property>
-            <property name="homogeneous">1</property>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Layout Tweaks</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Extend panel left box</property>
+            <property name="subtitle" translatable="yes">Extend top panel left box</property>
+            <property name="activatable-widget">extend_left_box</property>
             <child>
-              <object class="GtkBox" id="autofocus_windows_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Auto focus new windows</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="autofocus_windows">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="extend_left_box">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Reduce panel spacing</property>
+            <property name="subtitle" translatable="yes">Reduce top panel icons and buttons spacing</property>
+            <property name="activatable-widget">reduce_panel_spacing</property>
             <child>
-              <object class="GtkBox" id="show_legacy_tray_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Show system tray in top bar</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="show_legacy_tray">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="reduce_panel_spacing">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Notifications position</property>
+            <property name="subtitle" translatable="yes">System notification messages position</property>
+            <property name="activatable-widget">notifications_position</property>
             <child>
-              <object class="GtkBox" id="show_appmenu_button_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Show appmenu in top bar</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="show_appmenu_button">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="notifications_position">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">2</property>
+                <items>
+                  <item id="0" translatable="yes">Center</item>
+                  <item id="1" translatable="yes">Left</item>
+                  <item id="2" translatable="yes">Right</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">System Tray</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Enable tray</property>
+            <property name="subtitle" translatable="yes">Show system tray in top panel</property>
+            <property name="activatable-widget">show_legacy_tray</property>
             <child>
-              <object class="GtkBox" id="show_desktop_name_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Show desktop name in top bar</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="show_desktop_name">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="show_legacy_tray">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Greyscale icons</property>
+            <property name="subtitle" translatable="yes">Convert tray icons to greyscale</property>
+            <property name="activatable-widget">greyscale_tray_icons</property>
             <child>
-              <object class="GtkBox" id="enable_titlebar_actions_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Enable titlebar actions on top bar click</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="enable_titlebar_actions">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="greyscale_tray_icons">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Application Menu</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Enable appmenu</property>
+            <property name="subtitle" translatable="yes">Show appmenu button in top panel</property>
+            <property name="activatable-widget">show_appmenu_button</property>
             <child>
-              <object class="GtkBox" id="restrict_to_primary_screen_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Restrict functionalities to the primary screen</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="restrict_to_primary_screen">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="show_appmenu_button">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Maximum width</property>
+            <property name="subtitle" translatable="yes">Maximum width for the appmenu button label</property>
+            <property name="activatable-widget">app_menu_max_width</property>
             <child>
-              <object class="GtkBox" id="hide_activities_button_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Hide activities button</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="hide_activities_button">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">1</property>
-                    <items>
-                      <item id="0" translatable="yes">Never</item>
-                      <item id="1" translatable="yes">Auto</item>
-                      <item id="2" translatable="yes">Always</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkSpinButton" id="app_menu_max_width">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="text">0</property>
+                <property name="adjustment">maxwidth_appmenu_adjustment</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Text ellipsis</property>
+            <property name="subtitle" translatable="yes">Text ellipsis mode for appmenu button label</property>
+            <property name="activatable-widget">app_menu_ellipsize_mode</property>
             <child>
-              <object class="GtkBox" id="hide_window_titlebars_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Hide window titlebars</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="hide_window_titlebars">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">2</property>
-                    <items>
-                      <item id="0" translatable="yes">Never</item>
-                      <item id="1" translatable="yes">Tiled</item>
-                      <item id="2" translatable="yes">Maximized</item>
-                      <item id="3" translatable="yes">Both</item>
-                      <item id="4" translatable="yes">Always</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="app_menu_ellipsize_mode">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">2</property>
+                <items>
+                  <item id="0" translatable="yes">Start</item>
+                  <item id="1" translatable="yes">Middle</item>
+                  <item id="2" translatable="yes">End</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Disable icon</property>
+            <property name="subtitle" translatable="yes">Hide application icon in appmenu button</property>
+            <property name="activatable-widget">hide_app_menu_icon</property>
             <child>
-              <object class="GtkBox" id="show_window_title_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Show window title in app menu</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="show_window_title">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">2</property>
-                    <items>
-                      <item id="0" translatable="yes">Never</item>
-                      <item id="1" translatable="yes">Tiled</item>
-                      <item id="2" translatable="yes">Maximized</item>
-                      <item id="3" translatable="yes">Both</item>
-                      <item id="4" translatable="yes">Always</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="hide_app_menu_icon">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Workspace Switcher</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Use text button</property>
+            <property name="subtitle" translatable="yes">Revive old activities text button</property>
+            <property name="activatable-widget">use_activities_text</property>
             <child>
-              <object class="GtkBox" id="show_window_buttons_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Show window buttons in top bar</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="show_window_buttons">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">2</property>
-                    <items>
-                      <item id="0" translatable="yes">Never</item>
-                      <item id="1" translatable="yes">Tiled</item>
-                      <item id="2" translatable="yes">Maximized</item>
-                      <item id="3" translatable="yes">Both</item>
-                      <item id="4" translatable="yes">Always</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="use_activities_text">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Hide switcher</property>
+            <property name="subtitle" translatable="yes">Hide workspace switcher button</property>
+            <property name="activatable-widget">hide_activities_button</property>
             <child>
-              <object class="GtkBox" id="notifications_position_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Notification messages position</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="notifications_position">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">2</property>
-                    <items>
-                      <item id="0" translatable="yes">Center</item>
-                      <item id="1" translatable="yes">Left</item>
-                      <item id="2" translatable="yes">Right</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="hide_activities_button">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">1</property>
+                <items>
+                  <item id="0" translatable="yes">Never</item>
+                  <item id="1" translatable="yes">Auto</item>
+                  <item id="2" translatable="yes">Always</item>
+                </items>
               </object>
             </child>
           </object>
-        </property>
-        <property name="tab">
-          <object class="GtkLabel" id="general_label">
-            <property name="hexpand">1</property>
-            <property name="can-focus">0</property>
-            <property name="label" translatable="yes">General</property>
-          </object>
-        </property>
+        </child>
       </object>
     </child>
     <child>
-      <object class="GtkNotebookPage">
-        <property name="child">
-          <object class="GtkBox" id="appearance_prefs">
-            <property name="valign">start</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-top">20</property>
-            <property name="margin-bottom">20</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">15</property>
-            <property name="homogeneous">1</property>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Desktop Name</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Enable desktop name</property>
+            <property name="subtitle" translatable="yes">Show desktop name label in top panel</property>
+            <property name="activatable-widget">show_desktop_name</property>
             <child>
-              <object class="GtkBox" id="extend_left_box_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Extend top bar left box</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="extend_left_box">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="show_desktop_name">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Desktop name label</property>
+            <property name="subtitle" translatable="yes">Text to use as desktop name label</property>
+            <property name="activatable-widget">desktop_name_text</property>
             <child>
-              <object class="GtkBox" id="use_activities_text_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Use text in activities button</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="use_activities_text">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkEntry" id="desktop_name_text">
+                <property name="valign">center</property>
+                <property name="max-width-chars">12</property>
+                <property name="width-request">130</property>
+                <property name="text" translatable="yes">GNOME Desktop</property>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="AdwPreferencesPage" id="windows_page">
+    <property name="name">appearance-page</property>
+    <property name="title" translatable="yes">Windows</property>
+    <property name="icon-name">emblem-photos-symbolic</property>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Behavior</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Primary screen only</property>
+            <property name="subtitle" translatable="yes">Restrict functionalities to the primary screen</property>
+            <property name="activatable-widget">restrict_to_primary_screen</property>
             <child>
-              <object class="GtkBox" id="greyscale_tray_icons_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Convert tray icons to greyscale</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="greyscale_tray_icons">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="restrict_to_primary_screen">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Auto focus</property>
+            <property name="subtitle" translatable="yes">Auto focus new windows</property>
+            <property name="activatable-widget">autofocus_windows</property>
             <child>
-              <object class="GtkBox" id="hide_app_menu_icon_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Hide app menu application icon</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="hide_app_menu_icon">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="autofocus_windows">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Panel click actions</property>
+            <property name="subtitle" translatable="yes">Enable titlebar actions on top panel click</property>
+            <property name="activatable-widget">enable_titlebar_actions</property>
             <child>
-              <object class="GtkBox" id="reduce_panel_spacing_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Reduce top bar items spacing</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSwitch" id="reduce_panel_spacing">
-                    <property name="hexpand">1</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="active">1</property>
-                  </object>
-                </child>
+              <object class="GtkSwitch" id="enable_titlebar_actions">
+                <property name="valign">center</property>
+                <property name="active">1</property>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Titlebars</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Hide titlebars</property>
+            <property name="subtitle" translatable="yes">Hide window titlebars</property>
+            <property name="activatable-widget">hide_window_titlebars</property>
             <child>
-              <object class="GtkBox" id="desktop_name_text_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Top bar desktop name text</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="desktop_name_text">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="text" translatable="yes">GNOME Desktop</property>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="hide_window_titlebars">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">2</property>
+                <items>
+                  <item id="0" translatable="yes">Never</item>
+                  <item id="1" translatable="yes">Tiled</item>
+                  <item id="2" translatable="yes">Maximized</item>
+                  <item id="3" translatable="yes">Both</item>
+                  <item id="4" translatable="yes">Always</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Show appmenu title</property>
+            <property name="subtitle" translatable="yes">Show window title in top panel appmenu</property>
+            <property name="activatable-widget">show_window_title</property>
             <child>
-              <object class="GtkBox" id="app_menu_max_width_section">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Max width for the app menu</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="app_menu_max_width">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="text">0</property>
-                    <property name="adjustment">maxwidth_appmenu_adjustment</property>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="show_window_title">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">2</property>
+                <items>
+                  <item id="0" translatable="yes">Never</item>
+                  <item id="1" translatable="yes">Tiled</item>
+                  <item id="2" translatable="yes">Maximized</item>
+                  <item id="3" translatable="yes">Both</item>
+                  <item id="4" translatable="yes">Always</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="AdwPreferencesGroup">
+        <property name="title" translatable="yes">Buttons</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Show buttons</property>
+            <property name="subtitle" translatable="yes">Show window buttons in top panel</property>
+            <property name="activatable-widget">show_window_buttons</property>
             <child>
-              <object class="GtkBox" id="app_menu_ellipsize_mode_section">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Ellipsis mode for app menu</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="app_menu_ellipsize_mode">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">2</property>
-                    <items>
-                      <item id="0" translatable="yes">Start</item>
-                      <item id="1" translatable="yes">Middle</item>
-                      <item id="2" translatable="yes">End</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="show_window_buttons">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">2</property>
+                <items>
+                  <item id="0" translatable="yes">Never</item>
+                  <item id="1" translatable="yes">Tiled</item>
+                  <item id="2" translatable="yes">Maximized</item>
+                  <item id="3" translatable="yes">Both</item>
+                  <item id="4" translatable="yes">Always</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Panel position</property>
+            <property name="subtitle" translatable="yes">Window buttons position in top panel</property>
+            <property name="activatable-widget">window_buttons_placement</property>
             <child>
-              <object class="GtkBox" id="window_buttons_placement_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Top bar window buttons position</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="window_buttons_placement">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">0</property>
-                    <items>
-                      <item id="0" translatable="yes">Auto</item>
-                      <item id="1" translatable="yes">Left</item>
-                      <item id="2" translatable="yes">Right</item>
-                      <item id="3" translatable="yes">First</item>
-                      <item id="4" translatable="yes">Last</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="window_buttons_placement">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">0</property>
+                <items>
+                  <item id="0" translatable="yes">Auto</item>
+                  <item id="1" translatable="yes">Left</item>
+                  <item id="2" translatable="yes">Right</item>
+                  <item id="3" translatable="yes">First</item>
+                  <item id="4" translatable="yes">Last</item>
+                </items>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Icon theme</property>
+            <property name="subtitle" translatable="yes">Top panel window buttons theme</property>
+            <property name="activatable-widget">window_buttons_theme</property>
             <child>
-              <object class="GtkBox" id="window_buttons_theme_section">
-                <property name="spacing">50</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="can-focus">0</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">Top bar window buttons theme</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="window_buttons_theme">
-                    <property name="hexpand">1</property>
-                    <property name="width-request">170</property>
-                    <property name="halign">end</property>
-                    <property name="active-id">default-dark</property>
-                    <items>
-                      <item id="auto" translatable="yes">Auto</item>
-                      <item id="default" translatable="yes">Default</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="window_buttons_theme">
+                <property name="valign">center</property>
+                <property name="width-request">130</property>
+                <property name="active-id">default-dark</property>
+                <items>
+                  <item id="auto" translatable="yes">Auto</item>
+                  <item id="default" translatable="yes">Default</item>
+                </items>
               </object>
             </child>
           </object>
-        </property>
-        <property name="tab">
-          <object class="GtkLabel" id="appearance_label">
-            <property name="hexpand">1</property>
-            <property name="can-focus">0</property>
-            <property name="label" translatable="yes">Appearance</property>
-          </object>
-        </property>
+        </child>
       </object>
     </child>
   </object>