From c6efced3260e3e72bc09e2f4d8f0f2eac3632d8f Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 26 Nov 2023 11:25:31 +0100
Subject: [PATCH] Improve UI

---
 src/components/input/outputStreamEntry.rs     |  12 +-
 src/components/input/outputStreamEntryImpl.rs |  10 +-
 src/components/input/sourceBox.rs             |  19 +-
 src/components/input/sourceBoxImpl.rs         |   4 +-
 src/components/input/sourceEntry.rs           |   6 +-
 src/components/input/sourceEntryImpl.rs       |   8 +-
 src/components/output/inputStreamEntry.rs     |  14 +-
 src/components/output/inputStreamEntryImpl.rs |  12 +-
 src/components/output/sinkBox.rs              |  18 +-
 src/components/output/sinkBoxImpl.rs          |   4 +-
 src/components/output/sinkEntry.rs            |   6 +-
 src/components/output/sinkEntryImpl.rs        |   8 +-
 src/components/wifi/mod.rs                    |   3 +-
 src/components/wifi/savedWifiEntry.rs         |  11 +-
 src/components/wifi/savedWifiEntryImpl.rs     |   2 +
 src/components/wifi/utils.rs                  |  29 +
 src/components/wifi/wifiBox.rs                |  32 +-
 src/components/wifi/wifiBoxImpl.rs            |   2 +-
 src/components/wifi/wifiEntry.rs              |   2 +-
 src/resources/resetAudioInput.ui              |  66 +-
 src/resources/resetAudioOutput.ui             |  76 +--
 src/resources/resetInputStreamEntry.ui        | 119 ++--
 src/resources/resetOutputStreamEntry.ui       | 118 ++--
 src/resources/resetSinkEntry.ui               | 104 +--
 src/resources/resetSourceEntry.ui             | 104 +--
 src/resources/resetUI.cmb                     | 643 ++++++------------
 src/resources/resetWiFi.ui                    | 208 +-----
 src/resources/style/style.css                 |   4 +
 28 files changed, 609 insertions(+), 1035 deletions(-)
 create mode 100644 src/components/wifi/utils.rs

diff --git a/src/components/input/outputStreamEntry.rs b/src/components/input/outputStreamEntry.rs
index b47ed21..e0e6fdb 100644
--- a/src/components/input/outputStreamEntry.rs
+++ b/src/components/input/outputStreamEntry.rs
@@ -3,7 +3,7 @@ use std::time::{Duration, SystemTime};
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, ComboRowExt, PreferencesRowExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -16,7 +16,7 @@ use super::sourceBox::SourceBox;
 
 glib::wrapper! {
     pub struct OutputStreamEntry(ObjectSubclass<outputStreamEntryImpl::OutputStreamEntry>)
-    @extends gtk::Box, gtk::Widget,
+    @extends adw::PreferencesGroup, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
@@ -31,7 +31,7 @@ impl OutputStreamEntry {
             let box_imp = source_box.imp();
             let imp = obj.imp();
             let name = stream.application_name.clone() + ": " + stream.name.as_str();
-            imp.resetSourceName.set_text(name.as_str());
+            imp.resetSourceSelection.set_title(name.as_str());
             let volume = stream.volume.first().unwrap_or(&0_u32);
             let fraction = (*volume as f64 / 655.36).round();
             let percentage = (fraction).to_string() + "%";
@@ -69,7 +69,7 @@ impl OutputStreamEntry {
                 //     list = box_imp.resetModelList.try_borrow();
                 // }
                 // let list = list.unwrap();
-                imp.resetSelectedSource.set_model(Some(&*list));
+                imp.resetSourceSelection.set_model(Some(&*list));
                 let map = box_imp.resetSourceMap.write().unwrap();
                 // while map.is_err() {
                 //     map = box_imp.resetSourceMap.try_borrow();
@@ -83,10 +83,10 @@ impl OutputStreamEntry {
                 let name = &name.alias;
                 let index = map.get(name);
                 if index.is_some() {
-                    imp.resetSelectedSource.set_selected(index.unwrap().1);
+                    imp.resetSourceSelection.set_selected(index.unwrap().1);
                 }
             }
-            imp.resetSelectedSource.connect_selected_notify(
+            imp.resetSourceSelection.connect_selected_notify(
                 clone!(@weak imp, @weak box_imp => move |dropdown| {
                     let selected = dropdown.selected_item();
                     if selected.is_none() {
diff --git a/src/components/input/outputStreamEntryImpl.rs b/src/components/input/outputStreamEntryImpl.rs
index 641db53..0bc4359 100644
--- a/src/components/input/outputStreamEntryImpl.rs
+++ b/src/components/input/outputStreamEntryImpl.rs
@@ -1,6 +1,8 @@
 use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
+use adw::{ComboRow, PreferencesGroup};
+use adw::subclass::prelude::PreferencesGroupImpl;
 
 use crate::components::input::outputStreamEntry;
 use gtk::subclass::prelude::*;
@@ -12,9 +14,7 @@ use ReSet_Lib::audio::audio::OutputStream;
 #[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]
 pub struct OutputStreamEntry {
     #[template_child]
-    pub resetSourceName: TemplateChild<Label>,
-    #[template_child]
-    pub resetSelectedSource: TemplateChild<DropDown>,
+    pub resetSourceSelection: TemplateChild<ComboRow>,
     #[template_child]
     pub resetSourceMute: TemplateChild<Button>,
     #[template_child]
@@ -33,7 +33,7 @@ impl ObjectSubclass for OutputStreamEntry {
     const ABSTRACT: bool = false;
     const NAME: &'static str = "resetOutputStreamEntry";
     type Type = outputStreamEntry::OutputStreamEntry;
-    type ParentType = gtk::Box;
+    type ParentType = PreferencesGroup;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -44,7 +44,7 @@ impl ObjectSubclass for OutputStreamEntry {
     }
 }
 
-impl BoxImpl for OutputStreamEntry {}
+impl PreferencesGroupImpl for OutputStreamEntry {}
 
 impl ObjectImpl for OutputStreamEntry {}
 
diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
index 20fea81..e51d3c6 100644
--- a/src/components/input/sourceBox.rs
+++ b/src/components/input/sourceBox.rs
@@ -1,3 +1,4 @@
+use adw::prelude::PreferencesRowExt;
 use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
@@ -55,12 +56,12 @@ impl SourceBox {
         selfImp
             .resetCardsRow
             .set_action_target_value(Some(&Variant::from("profileConfiguration")));
-        selfImp
-            .resetOutputStreamButton
-            .set_action_name(Some("navigation.pop"));
-        selfImp
-            .resetInputCardsBackButton
-            .set_action_name(Some("navigation.pop"));
+
+        selfImp.resetOutputStreamButton.set_activatable(true);
+        selfImp.resetOutputStreamButton.set_action_name(Some("navigation.pop"));
+
+        selfImp.resetInputCardsBackButton.set_activatable(true);
+        selfImp.resetInputCardsBackButton.set_action_name(Some("navigation.pop"));
 
         let factory = &SignalListItemFactory::new();
         factory.connect_setup(|_, item| {
@@ -457,7 +458,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
                 } else {
                     imp.resetSelectedSource.set_active(false);
                 }
-                imp.resetSourceName.set_text(ir.source.alias.clone().as_str());
+                imp.resetSourceName.set_title(ir.source.alias.clone().as_str());
                 imp.resetVolumePercentage.set_text(&percentage);
                 imp.resetVolumeSlider.set_value(*volume as f64);
 
@@ -530,7 +531,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
                             .set_icon_name("audio-input-microphone-symbolic");
                     }
                     let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str();
-                    imp.resetSourceName.set_text(name.as_str());
+                    imp.resetSourceSelection.set_title(name.as_str());
                     let volume = ir.stream.volume.first().unwrap_or(&0_u32);
                     let fraction = (*volume as f64 / 655.36).round();
                     let percentage = (fraction).to_string() + "%";
@@ -539,7 +540,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
                     let map = output_box_imp.resetSourceMap.read().unwrap();
                     let index = map.get(&alias);
                     if index.is_some() {
-                        imp.resetSelectedSource.set_selected(index.unwrap().1);
+                        imp.resetSourceSelection.set_selected(index.unwrap().1);
                     }
                 });
             });
diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs
index 2a1cdae..f5d6552 100644
--- a/src/components/input/sourceBoxImpl.rs
+++ b/src/components/input/sourceBoxImpl.rs
@@ -35,11 +35,11 @@ pub struct SourceBox {
     #[template_child]
     pub resetSources: TemplateChild<gtk::Box>,
     #[template_child]
-    pub resetOutputStreamButton: TemplateChild<ListEntry>,
+    pub resetOutputStreamButton: TemplateChild<ActionRow>,
     #[template_child]
     pub resetOutputStreams: TemplateChild<gtk::Box>,
     #[template_child]
-    pub resetInputCardsBackButton: TemplateChild<ListEntry>,
+    pub resetInputCardsBackButton: TemplateChild<ActionRow>,
     #[template_child]
     pub resetCards: TemplateChild<PreferencesGroup>,
     pub resetDefaultCheckButton: Arc<CheckButton>,
diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs
index f22eff4..423f20d 100644
--- a/src/components/input/sourceEntry.rs
+++ b/src/components/input/sourceEntry.rs
@@ -3,7 +3,7 @@ use std::time::{Duration, SystemTime};
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, CheckButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -15,7 +15,7 @@ use super::sourceEntryImpl;
 
 glib::wrapper! {
     pub struct SourceEntry(ObjectSubclass<sourceEntryImpl::SourceEntry>)
-    @extends gtk::Box, gtk::Widget,
+    @extends adw::PreferencesGroup, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
@@ -28,7 +28,7 @@ impl SourceEntry {
         // TODO use event callback for progress bar -> this is the "im speaking" indicator
         {
             let imp = obj.imp();
-            imp.resetSourceName.set_text(stream.alias.clone().as_str());
+            imp.resetSourceName.set_title(stream.alias.clone().as_str());
             let name = Arc::new(stream.name.clone());
             let volume = stream.volume.first().unwrap_or(&0_u32);
             let fraction = (*volume as f64 / 655.36).round();
diff --git a/src/components/input/sourceEntryImpl.rs b/src/components/input/sourceEntryImpl.rs
index 0309485..bee44d8 100644
--- a/src/components/input/sourceEntryImpl.rs
+++ b/src/components/input/sourceEntryImpl.rs
@@ -1,6 +1,8 @@
 use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
+use adw::{ActionRow, PreferencesGroup};
+use adw::subclass::prelude::PreferencesGroupImpl;
 
 use gtk::subclass::prelude::*;
 use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale};
@@ -13,7 +15,7 @@ use super::sourceEntry;
 #[template(resource = "/org/Xetibo/ReSet/resetSourceEntry.ui")]
 pub struct SourceEntry {
     #[template_child]
-    pub resetSourceName: TemplateChild<Label>,
+    pub resetSourceName: TemplateChild<ActionRow>,
     #[template_child]
     pub resetSelectedSource: TemplateChild<CheckButton>,
     #[template_child]
@@ -33,7 +35,7 @@ impl ObjectSubclass for SourceEntry {
     const ABSTRACT: bool = false;
     const NAME: &'static str = "resetSourceEntry";
     type Type = sourceEntry::SourceEntry;
-    type ParentType = gtk::Box;
+    type ParentType = PreferencesGroup;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -44,7 +46,7 @@ impl ObjectSubclass for SourceEntry {
     }
 }
 
-impl BoxImpl for SourceEntry {}
+impl PreferencesGroupImpl for SourceEntry {}
 
 impl ObjectImpl for SourceEntry {}
 
diff --git a/src/components/output/inputStreamEntry.rs b/src/components/output/inputStreamEntry.rs
index e8cd95d..0c48d99 100644
--- a/src/components/output/inputStreamEntry.rs
+++ b/src/components/output/inputStreamEntry.rs
@@ -3,7 +3,7 @@ use std::time::{Duration, SystemTime};
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, ComboRowExt, PreferencesRowExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -16,7 +16,7 @@ use super::sinkBox::SinkBox;
 
 glib::wrapper! {
     pub struct InputStreamEntry(ObjectSubclass<inputStreamEntryImpl::InputStreamEntry>)
-    @extends gtk::Box, gtk::Widget,
+    @extends adw::PreferencesGroup, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
@@ -36,7 +36,7 @@ impl InputStreamEntry {
                     .set_icon_name("audio-volume-high-symbolic");
             }
             let name = stream.application_name.clone() + ": " + stream.name.as_str();
-            imp.resetSinkName.set_text(name.as_str());
+            imp.resetSinkSelection.set_title(name.as_str());
             let volume = stream.volume.first().unwrap_or(&0_u32);
             let fraction = (*volume as f64 / 655.36).round();
             let percentage = (fraction).to_string() + "%";
@@ -76,7 +76,7 @@ impl InputStreamEntry {
                 //     list = box_imp.resetModelList.try_borrow();
                 // }
                 // let list = list.unwrap();
-                imp.resetSelectedSink.set_model(Some(&*list));
+                imp.resetSinkSelection.set_model(Some(&*list));
                 let map = box_imp.resetSinkMap.read().unwrap();
                 let sink_list = box_imp.resetSinkList.read().unwrap();
                 let name = sink_list.get(&index);
@@ -84,7 +84,7 @@ impl InputStreamEntry {
                     let name = &name.unwrap().2;
                     let index = map.get(name);
                     if index.is_some() {
-                        imp.resetSelectedSink.set_selected(index.unwrap().1);
+                        imp.resetSinkSelection.set_selected(index.unwrap().1);
                     }
                 } else {
                     let mut name = box_imp.resetDefaultSink.try_borrow();
@@ -94,11 +94,11 @@ impl InputStreamEntry {
                     let name = &name.unwrap().alias;
                     let index = map.get(name);
                     if index.is_some() {
-                        imp.resetSelectedSink.set_selected(index.unwrap().1);
+                        imp.resetSinkSelection.set_selected(index.unwrap().1);
                     }
                 }
             }
-            imp.resetSelectedSink.connect_selected_notify(
+            imp.resetSinkSelection.connect_selected_notify(
                 clone!(@weak imp, @weak box_imp => move |dropdown| {
                     let selected = dropdown.selected_item();
                     if selected.is_none() {
diff --git a/src/components/output/inputStreamEntryImpl.rs b/src/components/output/inputStreamEntryImpl.rs
index 1b0c383..9de336e 100644
--- a/src/components/output/inputStreamEntryImpl.rs
+++ b/src/components/output/inputStreamEntryImpl.rs
@@ -1,9 +1,11 @@
 use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
+use adw::{ComboRow, PreferencesGroup};
+use adw::subclass::prelude::PreferencesGroupImpl;
 
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, DropDown, Label, ProgressBar, Scale};
+use gtk::{glib, Button, CompositeTemplate, Label, ProgressBar, Scale};
 use ReSet_Lib::audio::audio::InputStream;
 
 use super::inputStreamEntry;
@@ -13,9 +15,7 @@ use super::inputStreamEntry;
 #[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")]
 pub struct InputStreamEntry {
     #[template_child]
-    pub resetSinkName: TemplateChild<Label>,
-    #[template_child]
-    pub resetSelectedSink: TemplateChild<DropDown>,
+    pub resetSinkSelection: TemplateChild<ComboRow>,
     #[template_child]
     pub resetSinkMute: TemplateChild<Button>,
     #[template_child]
@@ -34,7 +34,7 @@ impl ObjectSubclass for InputStreamEntry {
     const ABSTRACT: bool = false;
     const NAME: &'static str = "resetInputStreamEntry";
     type Type = inputStreamEntry::InputStreamEntry;
-    type ParentType = gtk::Box;
+    type ParentType = PreferencesGroup;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -45,7 +45,7 @@ impl ObjectSubclass for InputStreamEntry {
     }
 }
 
-impl BoxImpl for InputStreamEntry {}
+impl PreferencesGroupImpl for InputStreamEntry {}
 
 impl ObjectImpl for InputStreamEntry {}
 
diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs
index 87174b7..849f0a0 100644
--- a/src/components/output/sinkBox.rs
+++ b/src/components/output/sinkBox.rs
@@ -1,3 +1,4 @@
+use adw::prelude::PreferencesRowExt;
 use adw::prelude::PreferencesGroupExt;
 use std::sync::Arc;
 use std::time::{Duration, SystemTime};
@@ -64,12 +65,11 @@ impl SinkBox {
             .set_action_target_value(Some(&Variant::from("profileConfiguration")));
         selfImp.resetCardsRow.connect_action_name_notify(|_| {});
 
-        selfImp
-            .resetInputStreamButton
-            .set_action_name(Some("navigation.pop"));
-        selfImp
-            .resetInputCardsBackButton
-            .set_action_name(Some("navigation.pop"));
+        selfImp.resetInputStreamButton.set_activatable(true);
+        selfImp.resetInputStreamButton.set_action_name(Some("navigation.pop"));
+
+        selfImp.resetInputCardsBackButton.set_activatable(true);
+        selfImp.resetInputCardsBackButton.set_action_name(Some("navigation.pop"));
 
         let factory = &SignalListItemFactory::new();
         factory.connect_setup(|_, item| {
@@ -462,7 +462,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
                 } else {
                     imp.resetSelectedSink.set_active(false);
                 }
-                imp.resetSinkName.set_text(ir.sink.alias.clone().as_str());
+                imp.resetSinkName.set_title(ir.sink.alias.clone().as_str());
                 imp.resetVolumePercentage.set_text(&percentage);
                 imp.resetVolumeSlider.set_value(*volume as f64);
             });
@@ -531,7 +531,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
                         .set_icon_name("audio-volume-high-symbolic");
                 }
                 let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str();
-                imp.resetSinkName.set_text(name.as_str());
+                imp.resetSinkSelection.set_title(name.as_str());
                 let volume = ir.stream.volume.first().unwrap_or(&0_u32);
                 let fraction = (*volume as f64 / 655.36).round();
                 let percentage = (fraction).to_string() + "%";
@@ -540,7 +540,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
                 let map = output_box_imp.resetSinkMap.read().unwrap();
                 let index = map.get(&alias);
                 if index.is_some() {
-                    imp.resetSelectedSink.set_selected(index.unwrap().1);
+                    imp.resetSinkSelection.set_selected(index.unwrap().1);
                 }
             });
         });
diff --git a/src/components/output/sinkBoxImpl.rs b/src/components/output/sinkBoxImpl.rs
index c1d1b98..05aae0a 100644
--- a/src/components/output/sinkBoxImpl.rs
+++ b/src/components/output/sinkBoxImpl.rs
@@ -37,11 +37,11 @@ pub struct SinkBox {
     #[template_child]
     pub resetSinks: TemplateChild<Box>,
     #[template_child]
-    pub resetInputStreamButton: TemplateChild<ListEntry>,
+    pub resetInputStreamButton: TemplateChild<ActionRow>,
     #[template_child]
     pub resetInputStreams: TemplateChild<Box>,
     #[template_child]
-    pub resetInputCardsBackButton: TemplateChild<ListEntry>,
+    pub resetInputCardsBackButton: TemplateChild<ActionRow>,
     #[template_child]
     pub resetCards: TemplateChild<PreferencesGroup>,
     pub resetDefaultCheckButton: Arc<CheckButton>,
diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs
index 303c17e..06fb6c0 100644
--- a/src/components/output/sinkEntry.rs
+++ b/src/components/output/sinkEntry.rs
@@ -3,7 +3,7 @@ use std::time::{Duration, SystemTime};
 
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{ButtonExt, CheckButtonExt, RangeExt};
+use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt};
 use dbus::blocking::Connection;
 use dbus::Error;
 use glib::subclass::types::ObjectSubclassIsExt;
@@ -15,7 +15,7 @@ use super::sinkEntryImpl;
 
 glib::wrapper! {
     pub struct SinkEntry(ObjectSubclass<sinkEntryImpl::SinkEntry>)
-    @extends gtk::Box, gtk::Widget,
+    @extends adw::PreferencesGroup, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
@@ -26,7 +26,7 @@ impl SinkEntry {
         // TODO handle events
         {
             let imp = obj.imp();
-            imp.resetSinkName.set_text(stream.alias.clone().as_str());
+            imp.resetSinkName.set_title(stream.alias.clone().as_str());
             let name = Arc::new(stream.name.clone());
             let volume = stream.volume.first().unwrap_or(&0_u32);
             let fraction = (*volume as f64 / 655.36).round();
diff --git a/src/components/output/sinkEntryImpl.rs b/src/components/output/sinkEntryImpl.rs
index 0531391..2fc06bd 100644
--- a/src/components/output/sinkEntryImpl.rs
+++ b/src/components/output/sinkEntryImpl.rs
@@ -1,6 +1,8 @@
 use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
+use adw::{ActionRow, PreferencesGroup};
+use adw::subclass::prelude::PreferencesGroupImpl;
 
 use crate::components::output::sinkEntry;
 use gtk::subclass::prelude::*;
@@ -12,7 +14,7 @@ use ReSet_Lib::audio::audio::Sink;
 #[template(resource = "/org/Xetibo/ReSet/resetSinkEntry.ui")]
 pub struct SinkEntry {
     #[template_child]
-    pub resetSinkName: TemplateChild<Label>,
+    pub resetSinkName: TemplateChild<ActionRow>,
     #[template_child]
     pub resetSelectedSink: TemplateChild<CheckButton>,
     #[template_child]
@@ -32,7 +34,7 @@ impl ObjectSubclass for SinkEntry {
     const ABSTRACT: bool = false;
     const NAME: &'static str = "resetSinkEntry";
     type Type = sinkEntry::SinkEntry;
-    type ParentType = gtk::Box;
+    type ParentType = PreferencesGroup;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -43,7 +45,7 @@ impl ObjectSubclass for SinkEntry {
     }
 }
 
-impl BoxImpl for SinkEntry {}
+impl PreferencesGroupImpl for SinkEntry {}
 
 impl ObjectImpl for SinkEntry {}
 
diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs
index 8d59124..4d8da17 100644
--- a/src/components/wifi/mod.rs
+++ b/src/components/wifi/mod.rs
@@ -10,4 +10,5 @@ pub mod wifiOptionsImpl;
 pub mod wifiAddressEntry;
 pub mod wifiAddressEntryImpl;
 pub mod wifiRouteEntry;
-pub mod wifiRouteEntryImpl;
\ No newline at end of file
+pub mod wifiRouteEntryImpl;
+pub mod utils;
\ No newline at end of file
diff --git a/src/components/wifi/savedWifiEntry.rs b/src/components/wifi/savedWifiEntry.rs
index 51c40dc..5546ebb 100644
--- a/src/components/wifi/savedWifiEntry.rs
+++ b/src/components/wifi/savedWifiEntry.rs
@@ -10,6 +10,7 @@ use glib::subclass::types::ObjectSubclassIsExt;
 use glib::{clone, PropertySet};
 use gtk::gio;
 use gtk::prelude::ListBoxRowExt;
+use crate::components::wifi::wifiBoxImpl::WifiBox;
 
 glib::wrapper! {
     pub struct SavedWifiEntry(ObjectSubclass<savedWifiEntryImpl::SavedWifiEntry>)
@@ -18,11 +19,17 @@ glib::wrapper! {
 }
 
 impl SavedWifiEntry {
-    pub fn new(name: &String, path: Path<'static>) -> Self {
+    pub fn new(name: &String, path: Path<'static>, wifiBox: &WifiBox) -> Self {
         let entry: SavedWifiEntry = Object::builder().build();
         entry.set_activatable(false);
         let entryImp = entry.imp();
-        // TODO handle edit
+
+        entryImp.resetEditSavedWifiButton.connect_clicked(clone!(@ weak entryImp, @ weak wifiBox => move |_| {
+            // TODO accesspoint has to be saved somewhere i guess
+            // let _option = getConnectionSettings(entryImp.accessPoint.borrow().associated_connection.clone());
+            // wifiBox.resetWifiNavigation.push(&*WifiOptions::new(_option));
+        }));
+
         entryImp.resetSavedWifiLabel.set_text(name);
         entryImp.resetConnectionPath.set(path);
         entryImp.resetDeleteSavedWifiButton.connect_clicked(
diff --git a/src/components/wifi/savedWifiEntryImpl.rs b/src/components/wifi/savedWifiEntryImpl.rs
index 6958d5d..31a0bdc 100644
--- a/src/components/wifi/savedWifiEntryImpl.rs
+++ b/src/components/wifi/savedWifiEntryImpl.rs
@@ -6,6 +6,7 @@ use adw::subclass::prelude::ActionRowImpl;
 use dbus::Path;
 use gtk::subclass::prelude::*;
 use gtk::{glib, Button, CompositeTemplate, Label};
+use ReSet_Lib::network::network::AccessPoint;
 
 use super::savedWifiEntry;
 
@@ -20,6 +21,7 @@ pub struct SavedWifiEntry {
     #[template_child]
     pub resetSavedWifiLabel: TemplateChild<Label>,
     pub resetConnectionPath: RefCell<Path<'static>>,
+    pub accessPoint: RefCell<AccessPoint>,
 }
 
 unsafe impl Send for SavedWifiEntry {}
diff --git a/src/components/wifi/utils.rs b/src/components/wifi/utils.rs
new file mode 100644
index 0000000..3b0898e
--- /dev/null
+++ b/src/components/wifi/utils.rs
@@ -0,0 +1,29 @@
+use std::collections::HashMap;
+use std::time::Duration;
+use dbus::arg::{RefArg};
+use dbus::blocking::Connection;
+use dbus::Error;
+use dbus::Path;
+use ReSet_Lib::network::connection::Connection as ResetConnection;
+
+pub fn getConnectionSettings(path: Path<'static>) -> ResetConnection {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<
+        (HashMap<String, HashMap<String, dbus::arg::Variant<Box<dyn RefArg>>>>,),
+        Error,
+    > = proxy.method_call("org.xetibo.ReSet", "GetConnectionSettings", (path,));
+    if res.is_err() {
+        ResetConnection::default();
+    }
+    let (res,) = res.unwrap();
+    let res = ResetConnection::convert_from_propmap(res);
+    if res.is_err() {
+        ResetConnection::default();
+    }
+    res.unwrap()
+}
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index ecab1a0..7a4546f 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use std::sync::atomic::Ordering;
 
 use std::sync::Arc;
@@ -31,7 +29,6 @@ use crate::components::wifi::wifiEntry::WifiEntry;
 
 use super::savedWifiEntry::SavedWifiEntry;
 
-use ReSet_Lib::network::connection::Connection as ResetConnection;
 
 glib::wrapper! {
     pub struct WifiBox(ObjectSubclass<wifiBoxImpl::WifiBox>)
@@ -57,9 +54,8 @@ impl WifiBox {
             .resetSavedNetworks
             .set_action_target_value(Some(&Variant::from("saved")));
 
-        selfImp
-            .resetAvailableNetworks
-            .set_action_name(Some("navigation.pop"));
+        selfImp.resetAvailableNetworks.set_activatable(true);
+        selfImp.resetAvailableNetworks.set_action_name(Some("navigation.pop"));
     }
 }
 
@@ -103,7 +99,7 @@ pub fn show_stored_connections(wifiBox: Arc<WifiBox>) {
                     // TODO include button for settings
                     let name =
                         &String::from_utf8(connection.1).unwrap_or_else(|_| String::from(""));
-                    let entry = SavedWifiEntry::new(name, connection.0);
+                    let entry = SavedWifiEntry::new(name, connection.0, selfImp);
                     selfImp.resetStoredWifiList.add(&entry);
                 }
             });
@@ -154,28 +150,6 @@ pub fn get_stored_connections() -> Vec<(Path<'static>, Vec<u8>)> {
     connections
 }
 
-pub fn getConnectionSettings(path: Path<'static>) -> ResetConnection {
-    let conn = Connection::new_session().unwrap();
-    let proxy = conn.with_proxy(
-        "org.xetibo.ReSet",
-        "/org/xetibo/ReSet",
-        Duration::from_millis(1000),
-    );
-    let res: Result<
-        (HashMap<String, HashMap<String, dbus::arg::Variant<Box<dyn RefArg>>>>,),
-        Error,
-    > = proxy.method_call("org.xetibo.ReSet", "GetConnectionSettings", (path,));
-    if res.is_err() {
-        ResetConnection::default();
-    }
-    let (res,) = res.unwrap();
-    let res = ResetConnection::convert_from_propmap(res);
-    if res.is_err() {
-        ResetConnection::default();
-    }
-    res.unwrap()
-}
-
 pub fn start_event_listener(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) {
     gio::spawn_blocking(move || {
         if listeners.network_listener.load(Ordering::SeqCst) {
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index 4824aac..014aabb 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -29,7 +29,7 @@ pub struct WifiBox {
     #[template_child]
     pub resetStoredWifiList: TemplateChild<PreferencesGroup>,
     #[template_child]
-    pub resetAvailableNetworks: TemplateChild<ListEntry>,
+    pub resetAvailableNetworks: TemplateChild<ActionRow>,
     pub wifiEntries: Arc<Mutex<HashMap<Vec<u8>, Arc<WifiEntry>>>>,
     pub wifiEntriesPath: Arc<Mutex<HashMap<Path<'static>, Arc<WifiEntry>>>>,
     pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index fc90b6d..ace6dec 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -12,8 +12,8 @@ use glib::clone;
 use gtk::gio;
 use gtk::prelude::{ListBoxRowExt, WidgetExt};
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
+use crate::components::wifi::utils::getConnectionSettings;
 
-use crate::components::wifi::wifiBox::getConnectionSettings;
 use crate::components::wifi::wifiBoxImpl::WifiBox;
 use crate::components::wifi::wifiEntryImpl;
 use crate::components::wifi::wifiOptions::WifiOptions;
diff --git a/src/resources/resetAudioInput.ui b/src/resources/resetAudioInput.ui
index 3b94899..f1bbe0c 100644
--- a/src/resources/resetAudioInput.ui
+++ b/src/resources/resetAudioInput.ui
@@ -131,33 +131,16 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="resetListBoxRow" id="resetOutputStreamButton">
+                      <object class="AdwActionRow" id="resetOutputStreamButton">
+                        <property name="title">Input Streams</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Input Streams</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
@@ -190,33 +173,16 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="resetListBoxRow" id="resetInputCardsBackButton">
+                      <object class="AdwActionRow" id="resetInputCardsBackButton">
+                        <property name="title">Input Streams</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Input Streams</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
diff --git a/src/resources/resetAudioOutput.ui b/src/resources/resetAudioOutput.ui
index 20df4e6..54604e0 100644
--- a/src/resources/resetAudioOutput.ui
+++ b/src/resources/resetAudioOutput.ui
@@ -131,33 +131,16 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="resetListBoxRow" id="resetInputStreamButton">
+                      <object class="AdwActionRow" id="resetInputStreamButton">
+                        <property name="title">Output Streams</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Output Streams</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
@@ -193,33 +176,16 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="resetListBoxRow" id="resetInputCardsBackButton">
+                      <object class="AdwActionRow" id="resetInputCardsBackButton">
+                        <property name="title">Output Streams</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Output Streams</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
@@ -229,11 +195,11 @@
                 <child>
                   <object class="GtkLabel"/>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="resetCards">
-                <property name="title">Devices</property>
+                <child>
+                  <object class="AdwPreferencesGroup" id="resetCards">
+                    <property name="title">Devices</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui
index 3ea0fba..ccc3266 100644
--- a/src/resources/resetInputStreamEntry.ui
+++ b/src/resources/resetInputStreamEntry.ui
@@ -2,71 +2,72 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetInputStreamEntry" parent="GtkBox">
-    <property name="margin-bottom">5</property>
-    <property name="margin-end">5</property>
-    <property name="margin-start">5</property>
-    <property name="margin-top">5</property>
-    <property name="orientation">vertical</property>
+  <requires lib="libadwaita" version="1.4"/>
+  <template class="resetInputStreamEntry" parent="AdwPreferencesGroup">
+    <property name="margin-bottom">10</property>
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkLabel" id="resetSinkName">
-            <property name="label">text</property>
-            <property name="margin-start">5</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkDropDown" id="resetSelectedSink">
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="margin-end">5</property>
-          </object>
-        </child>
+      <object class="GtkSeparator">
+        <property name="margin-top">10</property>
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <property name="margin-top">5</property>
-        <child>
-          <object class="GtkButton" id="resetSinkMute">
-            <property name="icon-name">audio-volume-high-symbolic</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScale" id="resetVolumeSlider">
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="page-increment">2005.4016</property>
-                <property name="step-increment">2005.4016</property>
-                <property name="upper">100270.08</property>
+      <object class="AdwComboRow" id="resetSinkSelection">
+        <property name="css-classes">audioRow</property>
+        <property name="title">asadf</property>
+        <property name="use-subtitle">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="AdwActionRow">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="margin-bottom">5</property>
+                <property name="margin-top">5</property>
+                <child>
+                  <object class="GtkButton" id="resetSinkMute">
+                    <property name="icon-name">audio-input-microphone-symbolic</property>
+                    <property name="margin-end">5</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScale" id="resetVolumeSlider">
+                    <property name="adjustment">
+                      <object class="GtkAdjustment">
+                        <property name="page-increment">2005.4016</property>
+                        <property name="step-increment">2005.4016</property>
+                        <property name="upper">100270.08</property>
+                      </object>
+                    </property>
+                    <property name="hexpand">True</property>
+                    <property name="valign">center</property>
+                    <property name="value-pos">bottom</property>
+                    <marks>
+                      <mark position="bottom" value="65536.0">100%</mark>
+                    </marks>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="resetVolumePercentage">
+                    <property name="label">100%</property>
+                    <property name="lines">1</property>
+                    <property name="width-request">40</property>
+                  </object>
+                </child>
               </object>
-            </property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-            <property name="value-pos">bottom</property>
-            <marks>
-              <mark position="bottom" value="65536.0">100%</mark>
-            </marks>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="resetVolumeMeter">
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="resetVolumePercentage">
-            <property name="label">100%</property>
-            <property name="lines">1</property>
-            <property name="width-request">40</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkProgressBar" id="resetVolumeMeter">
-        <property name="margin-top">5</property>
+        </property>
+        <property name="css-classes">audioRow
+</property>
       </object>
     </child>
   </template>
diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui
index 082b585..e35a3ee 100644
--- a/src/resources/resetOutputStreamEntry.ui
+++ b/src/resources/resetOutputStreamEntry.ui
@@ -2,71 +2,71 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetOutputStreamEntry" parent="GtkBox">
-    <property name="margin-bottom">5</property>
-    <property name="margin-end">5</property>
-    <property name="margin-start">5</property>
-    <property name="margin-top">5</property>
-    <property name="orientation">vertical</property>
+  <requires lib="libadwaita" version="1.4"/>
+  <template class="resetOutputStreamEntry" parent="AdwPreferencesGroup">
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkLabel" id="resetSourceName">
-            <property name="label">text</property>
-            <property name="margin-start">5</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkDropDown" id="resetSelectedSource">
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="margin-end">5</property>
-          </object>
-        </child>
+      <object class="GtkSeparator">
+        <property name="margin-top">10</property>
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <property name="margin-top">5</property>
-        <child>
-          <object class="GtkButton" id="resetSourceMute">
-            <property name="icon-name">audio-input-microphone-symbolic</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScale" id="resetVolumeSlider">
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="page-increment">2005.4016</property>
-                <property name="step-increment">2005.4016</property>
-                <property name="upper">100270.08</property>
+      <object class="AdwComboRow" id="resetSourceSelection">
+        <property name="css-classes">audioRow</property>
+        <property name="title">asadf</property>
+        <property name="use-subtitle">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="AdwActionRow">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="margin-bottom">5</property>
+                <property name="margin-top">5</property>
+                <child>
+                  <object class="GtkButton" id="resetSourceMute">
+                    <property name="icon-name">audio-input-microphone-symbolic</property>
+                    <property name="margin-end">5</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScale" id="resetVolumeSlider">
+                    <property name="adjustment">
+                      <object class="GtkAdjustment">
+                        <property name="page-increment">2005.4016</property>
+                        <property name="step-increment">2005.4016</property>
+                        <property name="upper">100270.08</property>
+                      </object>
+                    </property>
+                    <property name="hexpand">True</property>
+                    <property name="valign">center</property>
+                    <property name="value-pos">bottom</property>
+                    <marks>
+                      <mark position="bottom" value="65536.0">100%</mark>
+                    </marks>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="resetVolumePercentage">
+                    <property name="label">100%</property>
+                    <property name="lines">1</property>
+                    <property name="width-request">40</property>
+                  </object>
+                </child>
               </object>
-            </property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-            <property name="value-pos">bottom</property>
-            <marks>
-              <mark position="bottom" value="65536.0">100%</mark>
-            </marks>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="resetVolumeMeter">
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="resetVolumePercentage">
-            <property name="label">100%</property>
-            <property name="lines">1</property>
-            <property name="width-request">40</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkProgressBar" id="resetVolumeMeter">
-        <property name="margin-top">5</property>
+        </property>
+        <property name="css-classes">audioRow
+</property>
       </object>
     </child>
   </template>
diff --git a/src/resources/resetSinkEntry.ui b/src/resources/resetSinkEntry.ui
index 0d89cc5..fadbd04 100644
--- a/src/resources/resetSinkEntry.ui
+++ b/src/resources/resetSinkEntry.ui
@@ -2,22 +2,13 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetSinkEntry" parent="GtkBox">
-    <property name="margin-bottom">5</property>
-    <property name="margin-end">5</property>
-    <property name="margin-start">5</property>
-    <property name="margin-top">5</property>
-    <property name="orientation">vertical</property>
+  <requires lib="libadwaita" version="1.3"/>
+  <template class="resetSinkEntry" parent="AdwPreferencesGroup">
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkLabel" id="resetSinkName">
-            <property name="label">text</property>
-            <property name="margin-start">5</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
+      <object class="AdwActionRow" id="resetSinkName">
+        <property name="css-classes">audioRow</property>
+        <property name="title">aaaaaaaaaaaaaaa</property>
+        <property name="title-lines">3</property>
         <child>
           <object class="GtkCheckButton" id="resetSelectedSink">
             <property name="halign">end</property>
@@ -28,44 +19,61 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <property name="margin-top">5</property>
-        <child>
-          <object class="GtkButton" id="resetSinkMute">
-            <property name="icon-name">audio-volume-high-symbolic</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScale" id="resetVolumeSlider">
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="page-increment">2005.4016</property>
-                <property name="step-increment">2005.4016</property>
-                <property name="upper">100270.08</property>
+      <object class="AdwActionRow">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="margin-bottom">5</property>
+                <property name="margin-top">5</property>
+                <child>
+                  <object class="GtkButton" id="resetSinkMute">
+                    <property name="icon-name">audio-input-microphone-symbolic</property>
+                    <property name="margin-end">5</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScale" id="resetVolumeSlider">
+                    <property name="adjustment">
+                      <object class="GtkAdjustment">
+                        <property name="page-increment">2005.4016</property>
+                        <property name="step-increment">2005.4016</property>
+                        <property name="upper">100270.08</property>
+                      </object>
+                    </property>
+                    <property name="hexpand">True</property>
+                    <property name="valign">center</property>
+                    <property name="value-pos">bottom</property>
+                    <marks>
+                      <mark position="bottom" value="65536.0">100%</mark>
+                    </marks>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="resetVolumePercentage">
+                    <property name="label">100%</property>
+                    <property name="lines">1</property>
+                    <property name="width-request">40</property>
+                  </object>
+                </child>
               </object>
-            </property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-            <property name="value-pos">bottom</property>
-            <marks>
-              <mark position="bottom" value="65536.0">100%</mark>
-            </marks>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="resetVolumeMeter">
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="resetVolumePercentage">
-            <property name="label">100%</property>
-            <property name="lines">1</property>
-            <property name="width-request">40</property>
-          </object>
-        </child>
+        </property>
+        <property name="css-classes">audioRow
+</property>
       </object>
     </child>
     <child>
-      <object class="GtkProgressBar" id="resetVolumeMeter">
+      <object class="GtkSeparator">
+        <property name="margin-bottom">5</property>
         <property name="margin-top">5</property>
       </object>
     </child>
diff --git a/src/resources/resetSourceEntry.ui b/src/resources/resetSourceEntry.ui
index 21a8b82..20588d2 100644
--- a/src/resources/resetSourceEntry.ui
+++ b/src/resources/resetSourceEntry.ui
@@ -2,22 +2,13 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetSourceEntry" parent="GtkBox">
-    <property name="margin-bottom">5</property>
-    <property name="margin-end">5</property>
-    <property name="margin-start">5</property>
-    <property name="margin-top">5</property>
-    <property name="orientation">vertical</property>
+  <requires lib="libadwaita" version="1.3"/>
+  <template class="resetSourceEntry" parent="AdwPreferencesGroup">
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkLabel" id="resetSourceName">
-            <property name="label">text</property>
-            <property name="margin-start">5</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
+      <object class="AdwActionRow" id="resetSourceName">
+        <property name="css-classes">audioRow</property>
+        <property name="title">text</property>
+        <property name="title-lines">3</property>
         <child>
           <object class="GtkCheckButton" id="resetSelectedSource">
             <property name="halign">end</property>
@@ -28,44 +19,61 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="margin-bottom">5</property>
-        <property name="margin-top">5</property>
-        <child>
-          <object class="GtkButton" id="resetSourceMute">
-            <property name="icon-name">microphone-sensitivity-high-symbolic</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScale" id="resetVolumeSlider">
-            <property name="adjustment">
-              <object class="GtkAdjustment">
-                <property name="page-increment">2005.4016</property>
-                <property name="step-increment">2005.4016</property>
-                <property name="upper">100270.08</property>
+      <object class="AdwActionRow">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox">
+                <property name="margin-bottom">5</property>
+                <property name="margin-top">5</property>
+                <child>
+                  <object class="GtkButton" id="resetSourceMute">
+                    <property name="icon-name">audio-input-microphone-symbolic</property>
+                    <property name="margin-end">5</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScale" id="resetVolumeSlider">
+                    <property name="adjustment">
+                      <object class="GtkAdjustment">
+                        <property name="page-increment">2005.4016</property>
+                        <property name="step-increment">2005.4016</property>
+                        <property name="upper">100270.08</property>
+                      </object>
+                    </property>
+                    <property name="hexpand">True</property>
+                    <property name="valign">center</property>
+                    <property name="value-pos">bottom</property>
+                    <marks>
+                      <mark position="bottom" value="65536.0">100%</mark>
+                    </marks>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="resetVolumePercentage">
+                    <property name="label">100%</property>
+                    <property name="lines">1</property>
+                    <property name="width-request">40</property>
+                  </object>
+                </child>
               </object>
-            </property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-            <property name="value-pos">bottom</property>
-            <marks>
-              <mark position="bottom" value="65536.0">100%</mark>
-            </marks>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="resetVolumeMeter">
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="resetVolumePercentage">
-            <property name="label">100%</property>
-            <property name="lines">1</property>
-            <property name="width-request">40</property>
-          </object>
-        </child>
+        </property>
+        <property name="css-classes">audioRow
+</property>
       </object>
     </child>
     <child>
-      <object class="GtkProgressBar" id="resetVolumeMeter">
+      <object class="GtkSeparator">
+        <property name="margin-bottom">5</property>
         <property name="margin-top">5</property>
       </object>
     </child>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 38bd91b..cc4290a 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -6,23 +6,22 @@
 	(4,7,None,"resetWiFi.ui",None,None,None,None,None,None,None),
 	(5,12,None,"resetWifiEntry.ui",None,None,None,None,None,None,None),
 	(6,1,None,"resetSidebarEntry.ui",None,None,None,None,None,None,None),
-	(7,1,None,"resetInputStreamEntry.ui",None,None,None,None,None,None,None),
+	(7,14,None,"resetInputStreamEntry.ui",None,None,None,None,None,None,None),
 	(8,1,None,"resetAudioOutput.ui",None,None,None,None,None,None,None),
 	(10,1,None,"resetBluetooth.ui",None,None,None,None,None,None,None),
 	(11,2,None,"resetBluetoothEntry.ui",None,None,None,None,None,None,None),
 	(12,11,None,"resetAudioInput.ui",None,None,None,None,None,None,None),
-	(13,11,None,"resetOutputStreamEntry.ui",None,None,None,None,None,None,None),
+	(13,22,None,"resetOutputStreamEntry.ui",None,None,None,None,None,None,None),
 	(14,3,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
 	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
 	(17,5,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
-	(18,1,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
-	(19,1,None,"resetSourceEntry.ui",None,None,None,None,None,None,None),
+	(18,13,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
+	(19,13,None,"resetSourceEntry.ui",None,None,None,None,None,None,None),
 	(20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
 	(21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
 	(22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None),
-	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None),
-	(24,None,None,None,None,None,None,None,None,None,None)
+	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <ui_library>
 	(21,"gtk","4.12",None),
@@ -65,46 +64,15 @@
 	(4,182,"GtkBox",None,7,None,None,None,None,None),
 	(4,183,"GtkLabel",None,182,None,None,None,None,None),
 	(4,184,"GtkSwitch","resetWifiSwitch",182,None,None,None,1,None),
-	(4,185,"GtkListBox",None,175,None,None,None,None,None),
-	(4,186,"resetListBoxRow","resetAvailableNetworks",185,None,None,None,None,None),
-	(4,187,"GtkBox",None,186,None,None,None,None,None),
-	(4,188,"GtkLabel",None,187,None,None,None,None,None),
-	(4,189,"GtkImage",None,187,None,None,None,1,None),
 	(4,199,"AdwPreferencesGroup","resetWifiDetails",154,None,None,None,None,None),
 	(4,200,"AdwComboRow","resetWiFiDevice",199,None,None,None,-1,None),
 	(4,201,"AdwActionRow","resetSavedNetworks",199,None,None,None,-1,None),
 	(4,202,"GtkImage",None,201,None,None,None,None,None),
 	(4,203,"AdwPreferencesGroup","resetWifiList",167,None,None,None,-1,None),
-	(4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,1,None),
-	(4,205,"AdwPreferencesGroup",None,154,None,None,None,2,None),
-	(4,206,"AdwComboRow",None,205,None,None,None,None,None),
-	(4,207,"GtkLabel",None,206,None,None,None,None,None),
-	(4,208,"GtkStringList",None,206,None,None,None,None,None),
-	(4,209,"AdwActionRow",None,205,None,None,None,1,None),
-	(4,210,"GtkBox",None,209,None,None,None,None,None),
-	(4,211,"GtkBox",None,210,None,None,None,None,None),
-	(4,212,"GtkBox","resetOutputStreamEntry",211,None,None,None,None,None),
-	(4,213,"GtkBox",None,212,None,None,None,None,None),
-	(4,214,"GtkButton","resetSourceMute",213,None,None,None,None,None),
-	(4,215,"GtkScale","resetVolumeSlider",213,None,None,None,1,None),
-	(4,216,"GtkAdjustment",None,215,None,None,None,None,None),
-	(4,217,"GtkLabel","resetVolumePercentage",213,None,None,None,2,None),
-	(4,218,"GtkProgressBar","resetVolumeMeter",212,None,None,None,1,None),
-	(4,233,"GtkSeparator",None,154,None,None,None,3,None),
-	(4,234,"AdwPreferencesGroup",None,154,None,None,None,4,None),
-	(4,235,"AdwComboRow",None,234,None,None,None,None,None),
-	(4,236,"GtkLabel",None,235,None,None,None,None,None),
-	(4,237,"GtkStringList",None,235,None,None,None,None,None),
-	(4,238,"AdwActionRow",None,234,None,None,None,1,None),
-	(4,239,"GtkBox",None,238,None,None,None,None,None),
-	(4,240,"GtkBox",None,239,None,None,None,None,None),
-	(4,241,"GtkBox","resetOutputStreamEn2try",240,None,None,None,None,None),
-	(4,242,"GtkBox",None,241,None,None,None,None,None),
-	(4,243,"GtkButton","resetSou2rceMute",242,None,None,None,None,None),
-	(4,244,"GtkScale","resetVolum2eSlider",242,None,None,None,1,None),
-	(4,245,"GtkAdjustment",None,244,None,None,None,None,None),
-	(4,246,"GtkLabel","resetVolum2ePercentage",242,None,None,None,2,None),
-	(4,247,"GtkProgressBar","resetVolu2meMeter",241,None,None,None,1,None),
+	(4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,2,None),
+	(4,205,"AdwPreferencesGroup",None,175,None,None,None,None,None),
+	(4,206,"AdwActionRow","resetAvailableNetworks",205,None,None,None,-1,None),
+	(4,207,"GtkImage",None,206,None,None,None,None,None),
 	(5,12,"AdwActionRow","resetWifiEntry",None,None,None,None,-1,None),
 	(5,13,"GtkBox",None,12,None,None,None,None,None),
 	(5,14,"GtkBox",None,13,None,None,None,None,None),
@@ -118,16 +86,17 @@
 	(6,2,"GtkBox",None,1,None,None,None,-1,None),
 	(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
 	(6,7,"GtkLabel","resetSidebarLabel",2,None,None,None,1,None),
-	(7,1,"GtkBox","resetInputStreamEntry",None,None,None,None,-1,None),
-	(7,4,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
-	(7,5,"GtkBox",None,1,None,None,None,None,None),
-	(7,6,"GtkLabel","resetSinkName",5,None,None,None,None,None),
-	(7,8,"GtkBox",None,1,None,None,None,1,None),
-	(7,9,"GtkScale","resetVolumeSlider",8,None,None,None,1,None),
-	(7,10,"GtkAdjustment",None,9,None,None,None,None,None),
-	(7,11,"GtkButton","resetSinkMute",8,None,None,None,None,None),
-	(7,12,"GtkLabel","resetVolumePercentage",8,None,None,None,2,None),
-	(7,13,"GtkDropDown","resetSelectedSink",5,None,None,None,1,None),
+	(7,14,"AdwPreferencesGroup","resetInputStreamEntry",None,None,None,None,None,None),
+	(7,15,"AdwComboRow","resetSinkSelection",14,None,None,None,None,None),
+	(7,16,"AdwActionRow",None,14,None,None,None,1,None),
+	(7,17,"GtkBox",None,16,None,None,None,None,None),
+	(7,18,"GtkBox",None,17,None,None,None,None,None),
+	(7,19,"GtkButton","resetSinkMute",18,None,None,None,None,None),
+	(7,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None),
+	(7,21,"GtkAdjustment",None,20,None,None,None,None,None),
+	(7,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None),
+	(7,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None),
+	(7,24,"GtkSeparator",None,14,None,None,None,-1,None),
 	(8,1,"GtkBox","resetAudioOutput",None,None,None,None,None,None),
 	(8,53,"GtkLabel",None,1,None,None,None,None,None),
 	(8,54,"AdwNavigationView",None,1,None,None,None,1,None),
@@ -135,7 +104,7 @@
 	(8,56,"GtkBox",None,55,None,None,None,None,None),
 	(8,71,"AdwNavigationPage",None,54,None,None,None,1,None),
 	(8,72,"GtkBox",None,71,None,None,None,None,None),
-	(8,81,"GtkLabel",None,72,None,None,None,1,None),
+	(8,81,"GtkLabel",None,72,None,None,None,2,None),
 	(8,85,"GtkBox","resetInputStreams",56,None,None,None,4,None),
 	(8,86,"GtkLabel",None,85,None,None,None,None,None),
 	(8,89,"GtkBox","resetSinks",72,None,None,None,3,None),
@@ -147,27 +116,23 @@
 	(8,101,"GtkLabel","resetVolumePercentage",97,None,None,None,2,None),
 	(8,102,"GtkProgressBar","resetVolumeMeter",93,None,None,None,1,None),
 	(8,103,"GtkSeparator",None,56,None,None,None,3,None),
-	(8,109,"GtkListBox",None,72,None,None,None,None,None),
-	(8,110,"resetListBoxRow","resetInputStreamButton",109,None,None,None,None,None),
-	(8,111,"GtkBox",None,110,None,None,None,None,None),
-	(8,112,"GtkLabel",None,111,None,None,None,None,None),
-	(8,113,"GtkImage",None,111,None,None,None,1,None),
 	(8,115,"GtkAdjustment",None,99,None,None,None,-1,None),
 	(8,116,"AdwNavigationPage",None,54,None,None,None,2,None),
 	(8,117,"GtkBox",None,116,None,None,None,None,None),
-	(8,118,"GtkListBox",None,117,None,None,None,None,None),
-	(8,119,"resetListBoxRow","resetInputCardsBackButton",118,None,None,None,None,None),
-	(8,120,"GtkBox",None,119,None,None,None,None,None),
-	(8,121,"GtkLabel",None,120,None,None,None,None,None),
-	(8,122,"GtkImage",None,120,None,None,None,1,None),
-	(8,123,"GtkLabel",None,117,None,None,None,1,None),
+	(8,123,"GtkLabel",None,117,None,None,None,2,None),
 	(8,130,"AdwPreferencesGroup",None,56,None,None,None,None,None),
 	(8,132,"AdwActionRow","resetSinksRow",130,None,None,None,1,None),
 	(8,133,"GtkImage",None,132,None,None,None,None,None),
 	(8,134,"AdwActionRow","resetCardsRow",130,None,None,None,2,None),
 	(8,135,"GtkImage",None,134,None,None,None,None,None),
-	(8,136,"AdwPreferencesGroup","resetCards",116,None,None,None,1,None),
 	(8,137,"AdwComboRow","resetSinkDropdown",130,None,None,None,2,None),
+	(8,138,"AdwPreferencesGroup",None,72,None,None,None,None,None),
+	(8,139,"AdwActionRow","resetInputStreamButton",138,None,None,None,None,None),
+	(8,140,"GtkImage",None,139,None,None,None,None,None),
+	(8,141,"AdwPreferencesGroup",None,117,None,None,None,None,None),
+	(8,142,"AdwActionRow","resetInputCardsBackButton",141,None,None,None,None,None),
+	(8,143,"GtkImage",None,142,None,None,None,None,None),
+	(8,144,"AdwPreferencesGroup","resetCards",117,None,None,None,2,None),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
 	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
@@ -218,40 +183,37 @@
 	(12,30,"GtkBox","resetOutputStreams",15,None,None,None,4,None),
 	(12,31,"GtkLabel",None,30,None,None,None,None,None),
 	(12,34,"AdwNavigationPage",None,13,None,None,None,1,None),
-	(12,42,"GtkBox",None,34,None,None,None,None,None),
-	(12,43,"GtkListBox",None,42,None,None,None,1,None),
-	(12,44,"resetListBoxRow","resetOutputStreamButton",43,None,None,None,None,None),
-	(12,45,"GtkBox",None,44,None,None,None,None,None),
-	(12,46,"GtkLabel",None,45,None,None,None,None,None),
-	(12,47,"GtkImage",None,45,None,None,None,1,None),
+	(12,42,"GtkBox",None,34,None,None,None,1,None),
 	(12,49,"GtkBox","resetSources",42,None,None,None,2,None),
 	(12,50,"GtkLabel",None,49,None,None,None,None,None),
 	(12,51,"GtkAdjustment",None,25,None,None,None,-1,None),
 	(12,52,"AdwNavigationPage",None,13,None,None,None,2,None),
 	(12,53,"GtkBox",None,52,None,None,None,None,None),
-	(12,54,"GtkListBox",None,53,None,None,None,None,None),
-	(12,55,"resetListBoxRow","resetInputCardsBackButton",54,None,None,None,None,None),
-	(12,56,"GtkBox",None,55,None,None,None,None,None),
-	(12,57,"GtkLabel",None,56,None,None,None,None,None),
-	(12,58,"GtkImage",None,56,None,None,None,1,None),
-	(12,59,"GtkLabel",None,53,None,None,None,1,None),
-	(12,66,"AdwPreferencesGroup","resetCards",53,None,None,None,2,None),
+	(12,59,"GtkLabel",None,53,None,None,None,2,None),
+	(12,66,"AdwPreferencesGroup","resetCards",53,None,None,None,3,None),
 	(12,67,"AdwPreferencesGroup",None,15,None,None,None,None,None),
 	(12,69,"AdwActionRow","resetSourceRow",67,None,None,None,-1,None),
 	(12,70,"AdwActionRow","resetCardsRow",67,None,None,None,2,None),
 	(12,71,"GtkImage",None,69,None,None,None,-1,None),
 	(12,72,"GtkImage",None,70,None,None,None,None,None),
 	(12,73,"AdwComboRow","resetSourceDropdown",67,None,None,None,2,None),
-	(13,11,"GtkBox","resetOutputStreamEntry",None,None,None,None,None,None),
-	(13,12,"GtkBox",None,11,None,None,None,None,None),
-	(13,13,"GtkLabel","resetSourceName",12,None,None,None,None,None),
-	(13,14,"GtkDropDown","resetSelectedSource",12,None,None,None,1,None),
-	(13,15,"GtkBox",None,11,None,None,None,1,None),
-	(13,16,"GtkButton","resetSourceMute",15,None,None,None,None,None),
-	(13,17,"GtkScale","resetVolumeSlider",15,None,None,None,1,None),
-	(13,19,"GtkLabel","resetVolumePercentage",15,None,None,None,2,None),
-	(13,20,"GtkProgressBar","resetVolumeMeter",11,None,None,None,2,None),
-	(13,21,"GtkAdjustment",None,17,None,None,None,-1,None),
+	(12,74,"AdwPreferencesGroup",None,42,None,None,None,None,None),
+	(12,75,"AdwActionRow","resetOutputStreamButton",74,None,None,None,None,None),
+	(12,76,"GtkImage",None,75,None,None,None,None,None),
+	(12,77,"AdwPreferencesGroup",None,53,None,None,None,None,None),
+	(12,78,"AdwActionRow","resetInputCardsBackButton",77,None,None,None,None,None),
+	(12,79,"GtkImage",None,78,None,None,None,None,None),
+	(13,22,"AdwPreferencesGroup","resetOutputStreamEntry",None,None,None,None,None,None),
+	(13,23,"AdwComboRow","resetSourceSelection",22,None,None,None,None,None),
+	(13,26,"AdwActionRow",None,22,None,None,None,1,None),
+	(13,27,"GtkBox",None,26,None,None,None,None,None),
+	(13,36,"GtkBox",None,27,None,None,None,None,None),
+	(13,37,"GtkButton","resetSourceMute",36,None,None,None,None,None),
+	(13,38,"GtkScale","resetVolumeSlider",36,None,None,None,1,None),
+	(13,39,"GtkAdjustment",None,38,None,None,None,None,None),
+	(13,40,"GtkLabel","resetVolumePercentage",36,None,None,None,2,None),
+	(13,41,"GtkProgressBar","resetVolumeMeter",27,None,None,None,1,None),
+	(13,42,"GtkSeparator",None,22,None,None,None,-1,None),
 	(14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
 	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
@@ -265,26 +227,30 @@
 	(17,11,"GtkLabel","resetSavedWifiLabel",7,None,None,None,None,None),
 	(17,12,"GtkButton","resetDeleteSavedWifiButton",7,None,None,None,2,None),
 	(17,14,"GtkButton","resetEditSavedWifiButton",7,None,None,None,1,None),
-	(18,1,"GtkBox","resetSinkEntry",None,None,None,None,None,None),
-	(18,2,"GtkBox",None,1,None,None,None,None,None),
-	(18,3,"GtkLabel","resetSinkName",2,None,None,None,None,None),
-	(18,5,"GtkBox",None,1,None,None,None,1,None),
-	(18,6,"GtkButton","resetSinkMute",5,None,None,None,None,None),
-	(18,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
-	(18,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
-	(18,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
-	(18,11,"GtkCheckButton","resetSelectedSink",2,None,None,None,1,None),
-	(18,12,"GtkAdjustment",None,7,None,None,None,-1,None),
-	(19,1,"GtkBox","resetSourceEntry",None,None,None,None,None,None),
-	(19,2,"GtkBox",None,1,None,None,None,None,None),
-	(19,3,"GtkLabel","resetSourceName",2,None,None,None,None,None),
-	(19,4,"GtkCheckButton","resetSelectedSource",2,None,None,None,1,None),
-	(19,5,"GtkBox",None,1,None,None,None,1,None),
-	(19,6,"GtkButton","resetSourceMute",5,None,None,None,None,None),
-	(19,7,"GtkScale","resetVolumeSlider",5,None,None,None,1,None),
-	(19,9,"GtkLabel","resetVolumePercentage",5,None,None,None,2,None),
-	(19,10,"GtkProgressBar","resetVolumeMeter",1,None,None,None,2,None),
-	(19,12,"GtkAdjustment",None,7,None,None,None,-1,None),
+	(18,13,"AdwPreferencesGroup","resetSinkEntry",None,None,None,None,None,None),
+	(18,14,"AdwActionRow","resetSinkName",13,None,None,None,None,None),
+	(18,15,"GtkCheckButton","resetSelectedSink",14,None,None,None,None,None),
+	(18,16,"AdwActionRow",None,13,None,None,None,1,None),
+	(18,17,"GtkBox",None,16,None,None,None,None,None),
+	(18,18,"GtkBox",None,17,None,None,None,None,None),
+	(18,19,"GtkButton","resetSinkMute",18,None,None,None,None,None),
+	(18,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None),
+	(18,21,"GtkAdjustment",None,20,None,None,None,None,None),
+	(18,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None),
+	(18,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None),
+	(18,24,"GtkSeparator",None,13,None,None,None,2,None),
+	(19,13,"AdwPreferencesGroup","resetSourceEntry",None,None,None,None,None,None),
+	(19,14,"AdwActionRow","resetSourceName",13,None,None,None,None,None),
+	(19,15,"GtkCheckButton","resetSelectedSource",14,None,None,None,None,None),
+	(19,16,"AdwActionRow",None,13,None,None,None,1,None),
+	(19,17,"GtkBox",None,16,None,None,None,None,None),
+	(19,18,"GtkBox",None,17,None,None,None,None,None),
+	(19,19,"GtkButton","resetSourceMute",18,None,None,None,None,None),
+	(19,20,"GtkScale","resetVolumeSlider",18,None,None,None,1,None),
+	(19,21,"GtkAdjustment",None,20,None,None,None,None,None),
+	(19,22,"GtkLabel","resetVolumePercentage",18,None,None,None,2,None),
+	(19,23,"GtkProgressBar","resetVolumeMeter",17,None,None,None,1,None),
+	(19,24,"GtkSeparator",None,13,None,None,None,2,None),
 	(20,2,"AdwComboRow","resetCardEntry",None,None,None,None,None,None),
 	(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
 	(21,2,"GtkNotebook",None,1,None,None,None,-1,None),
@@ -343,21 +309,7 @@
 	(23,5,"GtkButton","resetRouteRemove",1,None,None,None,1,None),
 	(23,6,"GtkBox",None,2,None,None,None,2,None),
 	(23,7,"AdwEntryRow","resetRouteGateway",6,None,None,None,None,None),
-	(23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None),
-	(24,13,"AdwPreferencesGroup",None,None,None,None,None,-1,None),
-	(24,14,"AdwComboRow",None,13,None,None,None,None,None),
-	(24,26,"GtkLabel",None,14,None,None,None,-1,None),
-	(24,27,"GtkStringList",None,14,None,None,None,-1,None),
-	(24,37,"AdwActionRow",None,13,None,None,None,1,None),
-	(24,38,"GtkBox",None,37,None,None,None,-1,None),
-	(24,39,"GtkBox",None,38,None,None,None,None,None),
-	(24,40,"GtkBox","resetOutputStreamEntry",39,None,None,None,None,None),
-	(24,41,"GtkBox",None,40,None,None,None,None,None),
-	(24,42,"GtkButton","resetSourceMute",41,None,None,None,None,None),
-	(24,43,"GtkScale","resetVolumeSlider",41,None,None,None,1,None),
-	(24,44,"GtkAdjustment",None,43,None,None,None,None,None),
-	(24,45,"GtkLabel","resetVolumePercentage",41,None,None,None,2,None),
-	(24,46,"GtkProgressBar","resetVolumeMeter",40,None,None,None,1,None)
+	(23,8,"AdwEntryRow","resetRouteMetric",6,None,None,None,1,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -444,20 +396,6 @@
 	(4,184,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,184,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,184,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,185,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,187,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,188,"GtkLabel","label","Available Networks",None,None,None,None,None,None,None,None,None),
-	(4,188,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,189,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(4,189,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,189,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,189,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,200,"AdwPreferencesRow","title","WiFi Device",None,None,None,None,None,None,None,None,None),
 	(4,201,"AdwPreferencesRow","title","Saved Networks",None,None,None,None,None,None,None,None,None),
 	(4,202,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
@@ -465,60 +403,11 @@
 	(4,202,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,202,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,204,"AdwPreferencesGroup","title","Saved Networks",None,None,None,None,None,None,None,None,None),
-	(4,206,"AdwActionRow","activatable-widget",None,None,None,None,None,207,None,None,None,None),
-	(4,206,"AdwComboRow","model",None,None,None,None,None,208,None,None,None,None),
-	(4,206,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
-	(4,209,"GtkListBoxRow","child",None,None,None,None,None,210,None,None,None,None),
-	(4,211,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,211,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,212,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,212,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(4,212,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,212,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,212,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,213,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(4,213,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,214,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(4,214,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,214,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,215,"GtkRange","adjustment",None,None,None,None,None,216,None,None,None,None),
-	(4,215,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(4,215,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,215,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,216,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(4,216,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(4,216,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
-	(4,217,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(4,217,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(4,217,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(4,218,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,235,"AdwActionRow","activatable-widget",None,None,None,None,None,236,None,None,None,None),
-	(4,235,"AdwComboRow","model",None,None,None,None,None,237,None,None,None,None),
-	(4,235,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
-	(4,238,"GtkListBoxRow","child",None,None,None,None,None,239,None,None,None,None),
-	(4,240,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,240,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,241,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,241,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(4,241,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,241,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,241,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,242,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(4,242,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,243,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(4,243,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,243,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,244,"GtkRange","adjustment",None,None,None,None,None,245,None,None,None,None),
-	(4,244,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(4,244,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,244,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,245,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(4,245,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(4,245,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
-	(4,246,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(4,246,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(4,246,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(4,247,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,206,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None),
+	(4,207,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(4,207,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,207,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,207,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(5,12,"GtkListBoxRow","child",None,None,None,None,None,13,None,None,None,None),
 	(5,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,14,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
@@ -547,34 +436,30 @@
 	(6,2,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(6,6,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
-	(7,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(7,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(7,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(7,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(7,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(7,4,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(7,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(7,6,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
-	(7,6,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
-	(7,6,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(7,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(7,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(7,9,"GtkRange","adjustment",None,None,None,None,None,10,None,None,None,None),
-	(7,9,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(7,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(7,9,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(7,10,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
-	(7,11,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
-	(7,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(7,11,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(7,12,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(7,12,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(7,12,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(7,13,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(7,13,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(7,13,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(7,14,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(7,15,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
+	(7,15,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
+	(7,15,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
+	(7,16,"GtkListBoxRow","child",None,None,None,None,None,17,None,None,None,None),
+	(7,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None),
+	(7,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(7,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(7,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(7,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
+	(7,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(7,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(7,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None),
+	(7,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(7,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(7,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(7,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(7,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(7,21,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(7,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(7,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(7,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(7,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(7,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(8,53,"GtkLabel","label","Output",None,None,None,None,None,None,None,None,None),
@@ -615,47 +500,29 @@
 	(8,101,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
 	(8,102,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(8,109,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(8,111,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,112,"GtkLabel","label","Output Streams",None,None,None,None,None,None,None,None,None),
-	(8,112,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(8,113,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(8,113,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,113,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,113,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(8,116,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(8,116,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(8,117,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(8,118,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(8,120,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,121,"GtkLabel","label","Output Streams",None,None,None,None,None,None,None,None,None),
-	(8,121,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(8,122,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(8,122,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,122,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,122,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(8,132,"AdwPreferencesRow","title","Output Devices",None,None,None,None,None,None,None,None,None),
 	(8,133,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
 	(8,134,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
 	(8,135,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
-	(8,136,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
 	(8,137,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
 	(8,137,"AdwPreferencesRow","title","Default Output Device",None,None,None,None,None,None,None,None,None),
+	(8,139,"AdwPreferencesRow","title","Output Streams",None,None,None,None,None,None,None,None,None),
+	(8,140,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(8,140,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(8,140,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,140,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,142,"AdwPreferencesRow","title","Output Streams",None,None,None,None,None,None,None,None,None),
+	(8,143,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(8,143,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(8,143,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,143,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,144,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
@@ -782,20 +649,6 @@
 	(12,34,"AdwNavigationPage","tag","sources",None,None,None,None,None,None,None,None,None),
 	(12,34,"AdwNavigationPage","title","sources",None,None,None,None,None,None,None,None,None),
 	(12,42,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(12,43,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(12,45,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(12,46,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None),
-	(12,46,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(12,47,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(12,47,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(12,47,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(12,47,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(12,49,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,49,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(12,49,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -808,20 +661,6 @@
 	(12,52,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(12,52,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(12,53,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(12,54,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(12,56,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(12,57,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None),
-	(12,57,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(12,58,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(12,58,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(12,58,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(12,58,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(12,66,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
 	(12,69,"AdwPreferencesRow","title","Input Devices",None,None,None,None,None,None,None,None,None),
 	(12,70,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
@@ -829,34 +668,39 @@
 	(12,72,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
 	(12,73,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
 	(12,73,"AdwPreferencesRow","title","Default Input Device",None,None,None,None,None,None,None,None,None),
-	(13,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(13,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(13,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,11,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(13,11,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(13,12,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(13,13,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
-	(13,13,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
-	(13,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(13,14,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(13,14,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(13,14,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,15,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(13,15,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(13,16,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(13,16,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,16,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,17,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None),
-	(13,17,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(13,17,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(13,17,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,19,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(13,19,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(13,19,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(13,20,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(13,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(13,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(13,21,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(12,75,"AdwPreferencesRow","title","Input Streams",None,None,None,None,None,None,None,None,None),
+	(12,76,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(12,76,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(12,76,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(12,76,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(12,78,"AdwPreferencesRow","title","Input Streams",None,None,None,None,None,None,None,None,None),
+	(12,79,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(12,79,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(12,79,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(12,79,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(13,23,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
+	(13,23,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
+	(13,23,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
+	(13,26,"GtkListBoxRow","child",None,None,None,None,None,27,None,None,None,None),
+	(13,26,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None),
+	(13,27,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(13,36,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(13,36,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(13,37,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
+	(13,37,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(13,37,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(13,38,"GtkRange","adjustment",None,None,None,None,None,39,None,None,None,None),
+	(13,38,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(13,38,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(13,38,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(13,39,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(13,39,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(13,39,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(13,40,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(13,40,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(13,40,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(13,41,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(13,42,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
@@ -894,62 +738,60 @@
 	(17,14,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
 	(17,14,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(17,14,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(18,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(18,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(18,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(18,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(18,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(18,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(18,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
-	(18,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
-	(18,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(18,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(18,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(18,6,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
-	(18,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(18,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(18,7,"GtkRange","adjustment",None,None,None,None,None,12,None,None,None,None),
-	(18,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(18,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(18,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(18,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(18,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(18,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(18,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(18,11,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(18,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(18,11,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
-	(18,12,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(18,12,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(18,12,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
-	(19,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(19,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(19,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(19,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(19,1,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(19,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(19,3,"GtkLabel","label","text",None,None,None,None,None,None,None,None,None),
-	(19,3,"GtkLabel","wrap","True",None,None,None,None,None,None,None,None,None),
-	(19,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(19,4,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(19,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(19,4,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
-	(19,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(19,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(19,6,"GtkButton","icon-name","microphone-sensitivity-high-symbolic",None,None,None,None,None,None,None,None,None),
-	(19,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(19,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(19,7,"GtkRange","adjustment",None,None,None,None,None,12,None,None,None,None),
-	(19,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(19,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(19,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(19,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(19,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(19,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(19,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(19,12,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(19,12,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(19,12,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(18,14,"AdwActionRow","title-lines","3",None,None,None,None,None,None,None,None,None),
+	(18,14,"AdwPreferencesRow","title","aaaaaaaaaaaaaaa",None,None,None,None,None,None,None,None,None),
+	(18,14,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
+	(18,15,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(18,15,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(18,15,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(18,16,"GtkListBoxRow","child",None,None,None,None,None,17,None,None,None,None),
+	(18,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None),
+	(18,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(18,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(18,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(18,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
+	(18,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(18,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(18,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None),
+	(18,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(18,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(18,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(18,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(18,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(18,21,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(18,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(18,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(18,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(18,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(18,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(18,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,14,"AdwActionRow","title-lines","3",None,None,None,None,None,None,None,None,None),
+	(19,14,"AdwPreferencesRow","title","text",None,None,None,None,None,None,None,None,None),
+	(19,14,"GtkWidget","css-classes","audioRow",None,None,None,None,None,None,None,None,None),
+	(19,15,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(19,15,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(19,15,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(19,16,"GtkListBoxRow","child",None,None,None,None,None,17,None,None,None,None),
+	(19,16,"GtkWidget","css-classes","audioRow\n",None,None,None,None,None,None,None,None,None),
+	(19,17,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(19,18,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(19,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,19,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
+	(19,19,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(19,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(19,20,"GtkRange","adjustment",None,None,None,None,None,21,None,None,None,None),
+	(19,20,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(19,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(19,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(19,21,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(19,21,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
+	(19,21,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
+	(19,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(19,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(19,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(19,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(19,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(19,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(20,2,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
 	(21,2,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
 	(21,2,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
@@ -1022,51 +864,15 @@
 	(23,7,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
 	(23,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(23,8,"AdwPreferencesRow","title","Metric",None,None,None,None,None,None,None,None,None),
-	(23,8,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
-	(24,14,"AdwActionRow","activatable-widget",None,None,None,None,None,26,None,None,None,None),
-	(24,14,"AdwComboRow","model",None,None,None,None,None,27,None,None,None,None),
-	(24,14,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
-	(24,14,"AdwPreferencesRow","title","asadf",None,None,None,None,None,None,None,None,None),
-	(24,37,"GtkListBoxRow","child",None,None,None,None,None,38,None,None,None,None),
-	(24,39,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(24,39,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(24,40,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(24,40,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(24,40,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(24,40,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(24,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(24,41,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(24,41,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(24,42,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(24,42,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(24,42,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(24,43,"GtkRange","adjustment",None,None,None,None,None,44,None,None,None,None),
-	(24,43,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(24,43,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(24,43,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(24,44,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(24,44,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
-	(24,44,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
-	(24,45,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(24,45,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(24,45,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(24,46,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
+	(23,8,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
 	(3,42,"GtkWidget",2,2,None,1,None,None,None,None),
-	(7,9,"GtkScale",1,1,None,None,None,None,None,None),
-	(7,9,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(8,99,"GtkScale",1,1,None,None,None,None,None,None),
 	(8,99,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(12,25,"GtkScale",1,1,None,None,None,None,None,None),
 	(12,25,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(13,17,"GtkScale",1,1,None,None,None,None,None,None),
-	(13,17,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(18,7,"GtkScale",1,1,None,None,None,None,None,None),
-	(18,7,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(19,7,"GtkScale",1,1,None,None,None,None,None,None),
-	(19,7,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(21,25,"GtkStringList",1,1,None,None,None,None,None,None),
 	(21,25,"GtkStringList",2,2,"Automatic (DHCP)",1,None,None,None,None),
 	(21,25,"GtkStringList",2,3,"Manual",1,None,None,None,None),
@@ -1090,41 +896,28 @@
 	(21,41,"GtkStringList",2,8,"WPA &amp; WPA2 Personal",1,None,None,None,None),
 	(21,41,"GtkStringList",2,9,"WPA &amp; WPA2 Enterprise",1,None,None,None,None),
 	(21,41,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None),
-	(24,27,"GtkStringList",2,3,"dsfds",1,None,None,None,None),
-	(24,27,"GtkStringList",2,2,"asdf",1,None,None,None,None),
-	(24,27,"GtkStringList",1,1,None,None,None,None,None,None),
-	(24,43,"GtkScale",1,1,None,None,None,None,None,None),
-	(24,43,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(4,208,"GtkStringList",1,1,None,None,None,None,None,None),
-	(4,208,"GtkStringList",2,2,"asdf",1,None,None,None,None),
-	(4,208,"GtkStringList",2,3,"dsfds",1,None,None,None,None),
-	(4,215,"GtkScale",1,1,None,None,None,None,None,None),
-	(4,215,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(4,237,"GtkStringList",1,1,None,None,None,None,None,None),
-	(4,237,"GtkStringList",2,2,"asdf",1,None,None,None,None),
-	(4,237,"GtkStringList",2,3,"dsfds",1,None,None,None,None),
-	(4,244,"GtkScale",1,1,None,None,None,None,None,None),
-	(4,244,"GtkScale",2,2,"100%",1,None,None,None,None)
+	(13,38,"GtkScale",1,1,None,None,None,None,None,None),
+	(13,38,"GtkScale",2,2,"100%",1,None,None,None,None),
+	(7,20,"GtkScale",1,1,None,None,None,None,None,None),
+	(7,20,"GtkScale",2,2,"100%",1,None,None,None,None),
+	(18,20,"GtkScale",1,1,None,None,None,None,None,None),
+	(18,20,"GtkScale",2,2,"100%",1,None,None,None,None),
+	(19,20,"GtkScale",1,1,None,None,None,None,None,None),
+	(19,20,"GtkScale",2,2,"100%",1,None,None,None,None)
   </object_data>
   <object_data_arg>
-	(7,9,"GtkScale",2,2,"value","65536.0"),
 	(3,42,"GtkWidget",2,2,"name","b"),
-	(7,9,"GtkScale",2,2,"position","bottom"),
 	(8,99,"GtkScale",2,2,"position","bottom"),
 	(8,99,"GtkScale",2,2,"value","65536.0"),
 	(12,25,"GtkScale",2,2,"value","65536.0"),
 	(12,25,"GtkScale",2,2,"position","bottom"),
-	(13,17,"GtkScale",2,2,"value","65536.0"),
-	(13,17,"GtkScale",2,2,"position","bottom"),
-	(18,7,"GtkScale",2,2,"position","bottom"),
-	(18,7,"GtkScale",2,2,"value","65536.0"),
-	(19,7,"GtkScale",2,2,"position","bottom"),
-	(19,7,"GtkScale",2,2,"value","65536.0"),
-	(24,43,"GtkScale",2,2,"position","bottom"),
-	(24,43,"GtkScale",2,2,"value","65536.0"),
-	(4,215,"GtkScale",2,2,"position","bottom"),
-	(4,215,"GtkScale",2,2,"value","65536.0"),
-	(4,244,"GtkScale",2,2,"position","bottom"),
-	(4,244,"GtkScale",2,2,"value","65536.0")
+	(13,38,"GtkScale",2,2,"position","bottom"),
+	(13,38,"GtkScale",2,2,"value","65536.0"),
+	(7,20,"GtkScale",2,2,"position","bottom"),
+	(7,20,"GtkScale",2,2,"value","65536.0"),
+	(18,20,"GtkScale",2,2,"position","bottom"),
+	(18,20,"GtkScale",2,2,"value","65536.0"),
+	(19,20,"GtkScale",2,2,"position","bottom"),
+	(19,20,"GtkScale",2,2,"value","65536.0")
   </object_data_arg>
 </cambalache-project>
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 783d5bb..a534d1e 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
-  <requires lib="gtk" version="4.12"/>
+  <requires lib="gtk" version="4.6"/>
   <requires lib="libadwaita" version="1.4"/>
   <template class="resetWifi" parent="GtkBox">
     <property name="hexpand">True</property>
@@ -87,179 +87,6 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="AdwPreferencesGroup">
-                    <child>
-                      <object class="AdwComboRow">
-                        <property name="activatable-widget">
-                          <object class="GtkLabel"/>
-                        </property>
-                        <property name="model">
-                          <object class="GtkStringList">
-                            <items>
-                              <item>asdf</item>
-                              <item>dsfds</item>
-                            </items>
-                          </object>
-                        </property>
-                        <property name="title">asadf</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwActionRow">
-                        <property name="child">
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="hexpand">True</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkBox" id="resetOutputStreamEntry">
-                                    <property name="margin-bottom">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="margin-bottom">5</property>
-                                        <property name="margin-top">5</property>
-                                        <child>
-                                          <object class="GtkButton" id="resetSourceMute">
-                                            <property name="icon-name">audio-input-microphone-symbolic</property>
-                                            <property name="margin-end">5</property>
-                                            <property name="valign">center</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkScale" id="resetVolumeSlider">
-                                            <property name="adjustment">
-                                              <object class="GtkAdjustment">
-                                                <property name="page-increment">2005.4016</property>
-                                                <property name="step-increment">2005.4016</property>
-                                                <property name="upper">100270.08</property>
-                                              </object>
-                                            </property>
-                                            <property name="hexpand">True</property>
-                                            <property name="valign">center</property>
-                                            <property name="value-pos">bottom</property>
-                                            <marks>
-                                              <mark position="bottom" value="65536.0">100%</mark>
-                                            </marks>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="resetVolumePercentage">
-                                            <property name="label">100%</property>
-                                            <property name="lines">1</property>
-                                            <property name="width-request">40</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkProgressBar" id="resetVolumeMeter">
-                                        <property name="margin-top">5</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="AdwPreferencesGroup">
-                    <child>
-                      <object class="AdwComboRow">
-                        <property name="activatable-widget">
-                          <object class="GtkLabel"/>
-                        </property>
-                        <property name="model">
-                          <object class="GtkStringList">
-                            <items>
-                              <item>asdf</item>
-                              <item>dsfds</item>
-                            </items>
-                          </object>
-                        </property>
-                        <property name="title">asadf</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="AdwActionRow">
-                        <property name="child">
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="hexpand">True</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkBox" id="resetOutputStreamEn2try">
-                                    <property name="margin-bottom">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="margin-bottom">5</property>
-                                        <property name="margin-top">5</property>
-                                        <child>
-                                          <object class="GtkButton" id="resetSou2rceMute">
-                                            <property name="icon-name">audio-input-microphone-symbolic</property>
-                                            <property name="margin-end">5</property>
-                                            <property name="valign">center</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkScale" id="resetVolum2eSlider">
-                                            <property name="adjustment">
-                                              <object class="GtkAdjustment">
-                                                <property name="page-increment">2005.4016</property>
-                                                <property name="step-increment">2005.4016</property>
-                                                <property name="upper">100270.08</property>
-                                              </object>
-                                            </property>
-                                            <property name="hexpand">True</property>
-                                            <property name="valign">center</property>
-                                            <property name="value-pos">bottom</property>
-                                            <marks>
-                                              <mark position="bottom" value="65536.0">100%</mark>
-                                            </marks>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="resetVolum2ePercentage">
-                                            <property name="label">100%</property>
-                                            <property name="lines">1</property>
-                                            <property name="width-request">40</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkProgressBar" id="resetVolu2meMeter">
-                                        <property name="margin-top">5</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
@@ -272,33 +99,16 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="resetListBoxRow" id="resetAvailableNetworks">
+                      <object class="AdwActionRow" id="resetAvailableNetworks">
+                        <property name="title">Available Networks</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Available Networks</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
diff --git a/src/resources/style/style.css b/src/resources/style/style.css
index 2631daf..70f5e26 100644
--- a/src/resources/style/style.css
+++ b/src/resources/style/style.css
@@ -20,3 +20,7 @@ label.resetSettingLabel {
     font-size: 32px;
     font-weight: bold;
 }
+
+row.audioRow  {
+    border-color: transparent;
+}
\ No newline at end of file