From 9f3815476d0a1e9e74f7f3dfae4ed5379207c21d Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sat, 11 Nov 2023 14:34:32 +0100
Subject: [PATCH 1/7] Add title and border to settingbox Fix padding around
 window Add some styling

---
 src/components/base/settingBox.rs           |  12 +-
 src/components/base/settingBoxImpl.rs       |  13 +-
 src/components/wifi/wifiBox.rs              |  16 +-
 src/components/window/handleSidebarClick.rs |  22 +-
 src/resources/resetAudio.ui                 |   1 -
 src/resources/resetMainWindow.ui            |  34 +-
 src/resources/resetMicrophone.ui            |   1 -
 src/resources/resetPopup.ui                 |  23 ++
 src/resources/resetSettingBox.ui            |  10 +-
 src/resources/resetSidebarEntry.ui          |   1 +
 src/resources/resetUI.cmb                   | 417 ++++++++++----------
 src/resources/style/style.css               |  21 +-
 12 files changed, 313 insertions(+), 258 deletions(-)
 create mode 100644 src/resources/resetPopup.ui

diff --git a/src/components/base/settingBox.rs b/src/components/base/settingBox.rs
index 95fea43..bffe624 100644
--- a/src/components/base/settingBox.rs
+++ b/src/components/base/settingBox.rs
@@ -1,19 +1,21 @@
 use crate::components::base::settingBoxImpl;
 use adw::glib;
 use adw::glib::{IsA, Object};
-use gtk::prelude::BoxExt;
+use glib::subclass::prelude::ObjectSubclassIsExt;
+use gtk::prelude::FrameExt;
 use gtk::Widget;
 
 glib::wrapper! {
     pub struct SettingBox(ObjectSubclass<settingBoxImpl::SettingBox>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+    @extends gtk::Frame, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
 }
 
 impl SettingBox {
-    pub fn new(child: &impl IsA<Widget>) -> Self {
+    pub fn new(child: &impl IsA<Widget>, title: &str) -> Self {
         let entry: SettingBox = Object::builder().build();
-        entry.append(child);
+        entry.set_child(Some(child));
+        entry.imp().resetSettingLabel.set_text(title);
         entry
     }
 }
\ No newline at end of file
diff --git a/src/components/base/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs
index da99683..e895ab5 100644
--- a/src/components/base/settingBoxImpl.rs
+++ b/src/components/base/settingBoxImpl.rs
@@ -1,17 +1,20 @@
-use gtk::{CompositeTemplate, glib};
+use gtk::{CompositeTemplate, glib, Label};
 use gtk::subclass::prelude::*;
 use crate::components::base::settingBox;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")]
-pub struct SettingBox {}
+pub struct SettingBox {
+    #[template_child]
+    pub resetSettingLabel: TemplateChild<Label>,
+}
 
 #[glib::object_subclass]
 impl ObjectSubclass for SettingBox {
-    const NAME: &'static str = "resetSetting";
+    const NAME: &'static str = "resetSettingFrame";
     type Type = settingBox::SettingBox;
-    type ParentType = gtk::Box;
+    type ParentType = gtk::Frame;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -28,7 +31,7 @@ impl ObjectImpl for SettingBox {
     }
 }
 
-impl BoxImpl for SettingBox {}
+impl FrameImpl for SettingBox {}
 
 impl WidgetImpl for SettingBox {}
 
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index f98495e..9f36487 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -10,12 +10,10 @@ use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
 use dbus::Path;
-use gtk::glib::{clone, Variant};
+use gtk::glib::Variant;
 use gtk::prelude::ActionableExt;
-use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
-use ReSet_Lib::signals::{
-    AccessPointAdded, AccessPointRemoved, BluetoothDeviceAdded, BluetoothDeviceRemoved,
-};
+use ReSet_Lib::network::network::AccessPoint;
+use ReSet_Lib::signals::{AccessPointAdded, AccessPointRemoved};
 use ReSet_Lib::utils::Events;
 
 use crate::components::wifi::wifiBoxImpl;
@@ -38,12 +36,8 @@ impl WifiBox {
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
 
-        selfImp
-            .resetSavedNetworks
-            .set_action_name(Some("navigation.push"));
-        selfImp
-            .resetSavedNetworks
-            .set_action_target_value(Some(&Variant::from("saved")));
+        selfImp.resetWifiSwitchRow.set_action_name(Some("navigation.push"));
+        selfImp.resetWifiSwitchRow.set_action_target_value(Some(&Variant::from("saved")))
     }
 
     pub fn donotdisturb() {
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index b59ea13..218f221 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -9,8 +9,8 @@ use crate::components::wifi::wifiBox::{WifiBox, scanForWifi};
 pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifiBox = Arc::new(WifiBox::new());
     scanForWifi(wifiBox.clone());
-    let wifiBox = SettingBox::new(&*wifiBox);
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new());
+    let wifiBox = SettingBox::new(&*wifiBox, "WiFi");
+    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
     resetMain.remove_all();
     resetMain.insert(&wifiBox, -1);
     resetMain.insert(&bluetoothBox, -1);
@@ -18,14 +18,16 @@ pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
 };
 
 pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let wifiBox = SettingBox::new(&WifiBox::new());
+    let wifiBox = Arc::new(WifiBox::new());
+    scanForWifi(wifiBox.clone());
+    let wifiBox = SettingBox::new(&*wifiBox, "WiFi");
     resetMain.remove_all();
     resetMain.insert(&wifiBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
 pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new());
+    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
     resetMain.remove_all();
     resetMain.insert(&bluetoothBox, -1);
     resetMain.set_max_children_per_line(1);
@@ -39,14 +41,14 @@ pub const HANDLE_VPN_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
 };
 
 pub const HANDLE_AUDIO_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let audioBox = AudioBox::new();
+    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
 pub const HANDLE_VOLUME_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let audioBox = AudioBox::new();
+    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
@@ -59,10 +61,6 @@ pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_HOME: fn(FlowBox) =  |resetMain: FlowBox|   {
-    resetMain.remove_all();
-};
-
 pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
@@ -90,3 +88,7 @@ pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
+
+pub const HANDLE_HOME: fn(FlowBox) =  |resetMain: FlowBox|   {
+    resetMain.remove_all();
+};
diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudio.ui
index 9caf71a..c4286b5 100644
--- a/src/resources/resetAudio.ui
+++ b/src/resources/resetAudio.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetAudio" parent="GtkBox">
     <property name="halign">center</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 0e51506..779ed80 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -6,6 +6,8 @@
   <template class="resetUI" parent="AdwApplicationWindow">
     <property name="default-height">500</property>
     <property name="default-width">800</property>
+    <property name="height-request">200</property>
+    <property name="width-request">600</property>
     <child>
       <object class="GtkWindowHandle"/>
     </child>
@@ -13,19 +15,15 @@
       <object class="AdwOverlaySplitView" id="resetOverlaySplitView">
         <property name="content">
           <object class="GtkBox">
+            <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="GtkWindowHandle">
                 <child>
                   <object class="GtkBox">
                     <property name="valign">start</property>
-                    <child>
-                      <object class="GtkButton" id="resetSideBarToggle">
-                        <property name="icon-name">sidebar-show-symbolic</property>
-                        <property name="visible">False</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkButton" id="resetBack">
                         <property name="has-frame">False</property>
@@ -33,6 +31,12 @@
                         <property name="valign">start</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="resetSideBarToggle">
+                        <property name="icon-name">sidebar-show-symbolic</property>
+                        <property name="visible">False</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkButton" id="resetForward">
                         <property name="has-frame">False</property>
@@ -88,6 +92,12 @@
                             <property name="child">
                               <object class="GtkBox">
                                 <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkButton" id="resetShortcutsButton">
+                                    <property name="has-frame">False</property>
+                                    <property name="label">Shortcuts</property>
+                                  </object>
+                                </child>
                                 <child>
                                   <object class="GtkButton" id="resetPreferenceButton">
                                     <property name="has-frame">False</property>
@@ -100,12 +110,6 @@
                                     <property name="label">About</property>
                                   </object>
                                 </child>
-                                <child>
-                                  <object class="GtkButton" id="resetShortcutsButton">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">Shortcuts</property>
-                                  </object>
-                                </child>
                               </object>
                             </property>
                           </object>
@@ -151,13 +155,12 @@
             </child>
           </object>
         </property>
-        <property name="margin-end">5</property>
-        <property name="margin-start">5</property>
-        <property name="margin-top">5</property>
         <property name="max-sidebar-width">180.0</property>
         <property name="sidebar">
           <object class="GtkBox">
             <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="GtkWindowHandle">
@@ -172,6 +175,7 @@
             </child>
             <child>
               <object class="GtkScrolledWindow">
+                <property name="margin-top">5</property>
                 <property name="propagate-natural-height">True</property>
                 <child>
                   <object class="GtkViewport">
diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetMicrophone.ui
index cb862d2..1e5f6b4 100644
--- a/src/resources/resetMicrophone.ui
+++ b/src/resources/resetMicrophone.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetMicrophone" parent="GtkBox">
     <property name="halign">start</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
new file mode 100644
index 0000000..bc804ef
--- /dev/null
+++ b/src/resources/resetPopup.ui
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <requires lib="libadwaita" version="1.0"/>
+  <template class="resetPopup" parent="AdwWindow">
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkEntry" id="resetPopopEntry">
+            <property name="activates-default">True</property>
+            <property name="invisible-char-set">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetPopopButton">
+            <property name="label">connect</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 1c51a92..44c5edb 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -2,10 +2,14 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="resetSetting" parent="GtkBox">
+  <template class="resetSettingFrame" parent="GtkFrame">
+    <property name="css-classes">resetSettingFrame</property>
     <property name="halign">center</property>
-    <property name="orientation">vertical</property>
-    <property name="valign">start</property>
+    <property name="label-widget">
+      <object class="GtkLabel" id="resetSettingLabel">
+        <property name="css-classes">resetSettingLabel</property>
+      </object>
+    </property>
     <property name="width-request">500</property>
   </template>
 </interface>
diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui
index 6c4cd41..9b39fe7 100644
--- a/src/resources/resetSidebarEntry.ui
+++ b/src/resources/resetSidebarEntry.ui
@@ -18,5 +18,6 @@
         </child>
       </object>
     </property>
+    <property name="css-classes">resetSidebarEntry</property>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 2b43735..c64ac00 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -12,9 +12,9 @@
 	(11,2,None,"resetBluetoothEntry.ui",None,None,None,None,None,None,None),
 	(12,1,None,"resetMicrophone.ui",None,None,None,None,None,None,None),
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
-	(14,1,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
+	(14,2,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
-	(16,1,None,"resetPasswordPopup.ui",None,None,None,None,None,None,None)
+	(16,1,None,"resetPopup.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -26,8 +26,8 @@
 	(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None),
 	(3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
 	(3,25,"GtkBox",None,24,None,None,None,None,None),
-	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None),
-	(3,27,"GtkButton","resetBack",25,None,None,None,1,None),
+	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,1,None),
+	(3,27,"GtkButton","resetBack",25,None,None,None,None,None),
 	(3,28,"GtkButton","resetForward",25,None,None,None,2,None),
 	(3,31,"GtkButton","resetClose",25,None,None,None,5,None),
 	(3,33,"GtkMenuButton",None,25,None,None,None,4,None),
@@ -47,34 +47,34 @@
 	(3,48,"GtkButton",None,34,None,None,None,4,None),
 	(3,49,"GtkLabel",None,34,None,None,None,1,None),
 	(3,50,"GtkLabel",None,34,None,None,None,3,None),
-	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,2,None),
+	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
-	(4,70,"AdwNavigationView",None,7,None,None,None,-1,None),
-	(4,71,"AdwNavigationPage",None,70,None,None,None,-1,None),
-	(4,72,"AdwNavigationPage",None,70,None,None,None,-1,None),
-	(4,88,"GtkBox",None,71,None,None,None,-1,None),
-	(4,89,"GtkListBox","resetWifiDetails",88,None,None,None,None,None),
-	(4,98,"GtkBox",None,88,None,None,None,1,None),
-	(4,99,"GtkLabel",None,98,None,None,None,None,None),
-	(4,100,"GtkScrolledWindow",None,98,None,None,None,1,None),
-	(4,101,"GtkViewport",None,100,None,None,None,None,None),
-	(4,102,"GtkListBox","resetWifiList",101,None,None,None,None,None),
-	(4,103,"GtkButton","resetWifiAdvanced",88,None,None,None,2,None),
-	(4,105,"AdwNavigationPage",None,70,None,None,None,2,None),
-	(4,107,"GtkBox",None,72,None,None,None,-1,None),
-	(4,108,"GtkLabel",None,107,None,None,None,-1,None),
-	(4,109,"GtkButton",None,107,None,None,None,1,None),
-	(4,110,"GtkBox",None,105,None,None,None,1,None),
-	(4,111,"GtkLabel",None,110,None,None,None,None,None),
-	(4,112,"GtkButton",None,110,None,None,None,1,None),
-	(4,113,"resetListBoxRow","resetWifiSwitchRow",89,None,None,None,None,None),
-	(4,114,"GtkBox",None,113,None,None,None,None,None),
-	(4,115,"GtkLabel",None,114,None,None,None,None,None),
-	(4,116,"GtkSwitch","resetWifiSwitch",114,None,None,None,1,None),
-	(4,117,"resetListBoxRow","resetSavedNetworks",89,None,None,None,1,None),
-	(4,121,"GtkBox",None,117,None,None,None,1,None),
-	(4,122,"GtkLabel",None,121,None,None,None,None,None),
-	(4,123,"GtkImage",None,121,None,None,None,1,None),
+	(4,152,"AdwNavigationView",None,7,None,None,None,2,None),
+	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
+	(4,154,"GtkBox",None,153,None,None,None,None,None),
+	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,None,None),
+	(4,156,"resetListBoxRow","resetWifiSwitchRow",155,None,None,None,None,None),
+	(4,157,"GtkBox",None,156,None,None,None,None,None),
+	(4,158,"GtkLabel",None,157,None,None,None,None,None),
+	(4,159,"GtkSwitch","resetWifiSwitch",157,None,None,None,1,None),
+	(4,160,"resetListBoxRow","resetSavedNetworks",155,None,None,None,1,None),
+	(4,161,"GtkBox",None,160,None,None,None,None,None),
+	(4,162,"GtkLabel",None,161,None,None,None,None,None),
+	(4,163,"GtkImage",None,161,None,None,None,1,None),
+	(4,164,"GtkBox",None,154,None,None,None,1,None),
+	(4,165,"GtkLabel",None,164,None,None,None,None,None),
+	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
+	(4,167,"GtkViewport",None,166,None,None,None,None,None),
+	(4,168,"GtkListBox","resetWifiList",167,None,None,None,None,None),
+	(4,169,"GtkButton","resetWifiAdvanced",154,None,None,None,2,None),
+	(4,170,"AdwNavigationPage",None,152,None,None,None,1,None),
+	(4,171,"GtkBox",None,170,None,None,None,None,None),
+	(4,172,"GtkLabel",None,171,None,None,None,None,None),
+	(4,173,"GtkButton",None,171,None,None,None,1,None),
+	(4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
+	(4,175,"GtkBox",None,174,None,None,None,None,None),
+	(4,176,"GtkLabel",None,175,None,None,None,None,None),
+	(4,177,"GtkButton",None,175,None,None,None,1,None),
 	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
 	(5,3,"GtkBox",None,2,None,None,None,None,None),
 	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
@@ -98,51 +98,51 @@
 	(7,11,"GtkButton","resetSourceMute",8,None,None,None,None,None),
 	(7,12,"GtkLabel","resetVolumePercentage",8,None,None,None,2,None),
 	(8,1,"GtkBox","resetAudio",None,None,None,None,None,None),
-	(8,14,"GtkBox",None,1,None,None,None,None,None),
-	(8,15,"GtkLabel",None,14,None,None,None,None,None),
-	(8,16,"GtkDropDown","resetOutputDevice",14,None,None,None,1,None),
-	(8,18,"GtkSeparator",None,1,None,None,None,2,None),
-	(8,19,"resetAudioSourceEntry","asdf",1,None,None,None,3,None),
-	(8,20,"GtkBox",None,1,None,None,None,1,None),
-	(8,22,"GtkSwitch",None,20,None,None,None,1,None),
-	(8,23,"GtkLabel",None,20,None,None,None,None,None),
+	(8,35,"GtkBox",None,1,None,None,None,2,None),
+	(8,36,"GtkLabel",None,35,None,None,None,None,None),
+	(8,37,"GtkDropDown","resetOutputDevice",35,None,None,None,1,None),
+	(8,38,"GtkBox",None,1,None,None,None,3,None),
+	(8,39,"GtkLabel",None,38,None,None,None,None,None),
+	(8,40,"GtkSwitch",None,38,None,None,None,1,None),
+	(8,41,"GtkSeparator",None,1,None,None,None,4,None),
+	(8,42,"resetAudioSourceEntry","asdf",1,None,None,None,5,None),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
-	(10,57,"AdwNavigationView",None,1,None,None,None,None,None),
-	(10,58,"AdwNavigationPage",None,57,None,None,None,-1,None),
-	(10,59,"AdwNavigationPage",None,57,None,None,None,-1,None),
-	(10,60,"GtkBox",None,58,None,None,None,-1,None),
-	(10,62,"GtkListBox","resetBluetoothDetails",60,None,None,None,None,None),
-	(10,63,"resetListBoxRow","resetBluetoothSwitchRow",62,None,None,None,None,None),
-	(10,64,"GtkBox",None,63,None,None,None,None,None),
-	(10,65,"GtkLabel",None,64,None,None,None,None,None),
-	(10,66,"GtkSwitch","resetBluetoothSwitch",64,None,None,None,1,None),
-	(10,78,"GtkBox",None,60,None,None,None,1,None),
-	(10,79,"GtkLabel",None,78,None,None,None,None,None),
-	(10,80,"GtkScrolledWindow",None,78,None,None,None,1,None),
-	(10,81,"GtkViewport",None,80,None,None,None,None,None),
-	(10,82,"GtkListBox","resetBluetoothAvailableDevices",81,None,None,None,None,None),
-	(10,83,"GtkBox",None,60,None,None,None,2,None),
-	(10,84,"GtkLabel",None,83,None,None,None,None,None),
-	(10,85,"GtkScrolledWindow",None,83,None,None,None,1,None),
-	(10,86,"GtkViewport",None,85,None,None,None,None,None),
-	(10,87,"GtkListBox","resetBluetoothConnectedDevices",86,None,None,None,None,None),
-	(10,88,"GtkButton",None,60,None,None,None,3,None),
-	(10,91,"GtkBox",None,59,None,None,None,-1,None),
-	(10,92,"GtkLabel",None,91,None,None,None,None,None),
-	(10,93,"GtkButton",None,91,None,None,None,1,None),
+	(10,119,"AdwNavigationView",None,1,None,None,None,2,None),
+	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
+	(10,121,"GtkBox",None,120,None,None,None,None,None),
+	(10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,None,None),
+	(10,123,"resetListBoxRow","resetBluetoothSwitchRow",122,None,None,None,None,None),
+	(10,124,"GtkBox",None,123,None,None,None,None,None),
+	(10,125,"GtkLabel",None,124,None,None,None,None,None),
+	(10,126,"GtkSwitch","resetBluetoothSwitch",124,None,None,None,1,None),
+	(10,127,"GtkBox",None,121,None,None,None,1,None),
+	(10,128,"GtkLabel",None,127,None,None,None,None,None),
+	(10,129,"GtkScrolledWindow",None,127,None,None,None,1,None),
+	(10,130,"GtkViewport",None,129,None,None,None,None,None),
+	(10,131,"GtkListBox","resetBluetoothAvailableDevices",130,None,None,None,None,None),
+	(10,132,"GtkBox",None,121,None,None,None,2,None),
+	(10,133,"GtkLabel",None,132,None,None,None,None,None),
+	(10,134,"GtkScrolledWindow",None,132,None,None,None,1,None),
+	(10,135,"GtkViewport",None,134,None,None,None,None,None),
+	(10,136,"GtkListBox","resetBluetoothConnectedDevices",135,None,None,None,None,None),
+	(10,137,"GtkButton",None,121,None,None,None,3,None),
+	(10,138,"AdwNavigationPage",None,119,None,None,None,1,None),
+	(10,139,"GtkBox",None,138,None,None,None,None,None),
+	(10,140,"GtkLabel",None,139,None,None,None,None,None),
+	(10,141,"GtkButton",None,139,None,None,None,1,None),
 	(11,2,"GtkBox","resetBluetoothEntry",None,None,None,None,None,None),
 	(11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None),
 	(11,4,"GtkLabel","resetBluetoothLabel",2,None,None,None,1,None),
 	(11,5,"GtkButton","resetBluetoothButton",2,None,None,None,2,None),
 	(12,1,"GtkBox","resetMicrophone",None,None,None,None,None,None),
-	(12,2,"GtkBox",None,1,None,None,None,None,None),
+	(12,2,"GtkBox",None,1,None,None,None,1,None),
 	(12,3,"GtkLabel",None,2,None,None,None,None,None),
 	(12,4,"GtkDropDown","resetOutputDevice",2,None,None,None,1,None),
-	(12,5,"GtkBox",None,1,None,None,None,1,None),
+	(12,5,"GtkBox",None,1,None,None,None,2,None),
 	(12,6,"GtkLabel",None,5,None,None,None,None,None),
 	(12,7,"GtkSwitch",None,5,None,None,None,1,None),
-	(12,8,"GtkSeparator",None,1,None,None,None,2,None),
-	(12,9,"GtkViewport",None,1,None,None,None,3,None),
+	(12,8,"GtkSeparator",None,1,None,None,None,3,None),
+	(12,9,"GtkViewport",None,1,None,None,None,4,None),
 	(12,10,"resetMicEntry",None,9,None,None,None,-1,None),
 	(13,1,"GtkBox","resetMicEntry",None,None,None,None,None,None),
 	(13,2,"GtkBox",None,1,None,None,None,None,None),
@@ -154,26 +154,30 @@
 	(13,8,"GtkAdjustment",None,7,None,None,None,None,None),
 	(13,9,"GtkLabel","resetMicPercentage",5,None,None,None,2,None),
 	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
-	(14,1,"GtkBox","resetSetting",None,None,None,None,-1,None),
+	(14,2,"GtkFrame","resetSettingFrame",None,None,None,None,-1,None),
+	(14,3,"GtkLabel","resetSettingLabel",2,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
-	(16,1,"AdwWindow","resetPasswordPopup",None,None,None,None,-1,None),
+	(16,1,"AdwWindow","resetPopup",None,None,None,None,-1,None),
 	(16,2,"GtkBox",None,1,None,None,None,-1,None),
-	(16,3,"GtkEntry","resetWifiPasswordEntry",2,None,None,None,-1,None),
-	(16,4,"GtkButton","resetWifiPasswordButton",2,None,None,None,-1,None)
+	(16,3,"GtkEntry","resetPopopEntry",2,None,None,None,-1,None),
+	(16,4,"GtkButton","resetPopopButton",2,None,None,None,-1,None)
   </object>
   <object_property>
+	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
+	(3,1,"GtkWidget","width-request","600",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-width","800",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","content",None,None,None,None,None,3,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","max-sidebar-width","180.0",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","sidebar",None,None,None,None,None,18,None,None,None,None),
-	(3,2,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,19,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkSearchEntry","placeholder-text","Search",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
@@ -210,6 +214,7 @@
 	(3,39,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,39,"GtkButton","label","About",None,None,None,None,None,None,None,None,None),
 	(3,40,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(3,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
 	(3,43,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
@@ -236,65 +241,65 @@
 	(4,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,71,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
-	(4,72,"AdwNavigationPage","child",None,None,None,None,None,107,None,None,None,None),
-	(4,72,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
-	(4,88,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,89,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,89,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,89,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,89,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,89,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,98,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,99,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(4,99,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
-	(4,99,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,99,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,100,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(4,100,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,102,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,105,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
-	(4,108,"GtkLabel","label","advanced page",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,109,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,111,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,114,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,115,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
-	(4,115,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,116,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(4,116,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,116,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,116,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,116,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,121,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,122,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
-	(4,122,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,123,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
-	(4,123,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,123,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,123,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,153,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
+	(4,154,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,157,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,158,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
+	(4,158,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,159,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(4,159,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,159,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,159,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,159,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(4,161,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,162,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
+	(4,162,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,163,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(4,163,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,163,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,163,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,164,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(4,165,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
+	(4,165,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
+	(4,165,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,165,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,166,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(4,166,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,169,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,170,"AdwNavigationPage","child",None,None,None,None,None,171,None,None,None,None),
+	(4,170,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
+	(4,172,"GtkLabel","label","advanced page",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,173,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
+	(4,176,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,177,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
@@ -319,6 +324,7 @@
 	(5,10,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(5,10,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(6,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None),
+	(6,1,"GtkWidget","css-classes","resetSidebarEntry",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(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),
@@ -346,79 +352,78 @@
 	(7,12,"GtkWidget","width-request","40",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","halign","center",None,None,None,None,None,None,None,None,None),
-	(8,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
-	(8,14,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,15,"GtkLabel","label","Output Device",None,None,None,None,None,None,None,None,None),
-	(8,16,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,16,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,16,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,19,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(8,20,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,20,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(8,22,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(8,22,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,22,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,22,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(8,22,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,23,"GtkLabel","label","Show Applications",None,None,None,None,None,None,None,None,None),
+	(8,35,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(8,36,"GtkLabel","label","Output Device",None,None,None,None,None,None,None,None,None),
+	(8,37,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(8,37,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,37,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(8,38,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(8,38,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(8,39,"GtkLabel","label","Show Applications",None,None,None,None,None,None,None,None,None),
+	(8,40,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(8,40,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(8,40,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,40,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,40,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(8,42,"GtkWidget","margin-top","5",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,58,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
-	(10,59,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
-	(10,60,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,62,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(10,62,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(10,62,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(10,62,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,62,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,64,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(10,65,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
-	(10,65,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,66,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(10,66,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(10,66,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(10,66,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,66,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(10,78,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,79,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(10,79,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None),
-	(10,79,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,79,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,80,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(10,80,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(10,82,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(10,82,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
-	(10,82,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,82,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,82,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,83,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,83,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(10,84,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
-	(10,84,"GtkLabel","label","Connected devices",None,None,None,None,None,None,None,None,None),
-	(10,84,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,84,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,85,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
-	(10,85,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(10,87,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(10,87,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
-	(10,87,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,87,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,87,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,88,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,91,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,92,"GtkLabel","label","advanced bluetooth",None,None,None,None,None,None,None,None,None),
-	(10,93,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(10,93,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(10,93,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,93,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,93,"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),
+	(10,121,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,124,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,125,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
+	(10,125,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,126,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(10,126,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,126,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,126,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,126,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(10,127,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,128,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
+	(10,128,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None),
+	(10,128,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(10,128,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,129,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(10,129,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,132,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,132,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(10,133,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
+	(10,133,"GtkLabel","label","Connected devices",None,None,None,None,None,None,None,None,None),
+	(10,133,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(10,133,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,134,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
+	(10,134,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(10,137,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,138,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
+	(10,139,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,140,"GtkLabel","label","advanced bluetooth",None,None,None,None,None,None,None,None,None),
+	(10,141,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(10,141,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
+	(10,141,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(10,141,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(10,141,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(11,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
@@ -433,7 +438,6 @@
 	(11,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
 	(12,2,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -471,10 +475,11 @@
 	(13,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(13,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(13,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(14,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(14,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
-	(14,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
+	(14,2,"GtkFrame","label-widget",None,None,None,None,None,3,None,None,None,None),
+	(14,2,"GtkWidget","css-classes","resetSettingFrame",None,None,None,None,None,None,None,None,None),
+	(14,2,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
+	(14,2,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
+	(14,3,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(16,3,"GtkEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
diff --git a/src/resources/style/style.css b/src/resources/style/style.css
index eac5068..0523285 100644
--- a/src/resources/style/style.css
+++ b/src/resources/style/style.css
@@ -1,3 +1,22 @@
 button.resetClose {
     border-radius: 25px;
-}
\ No newline at end of file
+}
+
+row.resetSidebarEntry {
+    border-radius: 5px;
+}
+
+label.resetSettingLabel {
+    font-size: 32px;
+    font-weight: bold;
+}
+
+frame.resetSettingFrame {
+    border-radius: 5px;
+    padding: 10px;
+}
+
+frame > label {
+    font-size: 32px;
+    font-weight: bold;
+}

From 7d0fc0b9e75b5c8f784ed9be85d5a7119c7c1539 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 11 Nov 2023 17:55:59 +0100
Subject: [PATCH 2/7] feat: Add popups for password

---
 src/components/base/popup.rs          | 10 +--
 src/components/base/popupImpl.rs      | 30 ++++++---
 src/components/wifi/wifiBox.rs        |  1 +
 src/components/wifi/wifiEntry.rs      | 88 ++++++++++++++++++++++++---
 src/components/wifi/wifiEntryImpl.rs  | 11 ++--
 src/resources/resetPasswordPopup.ui   | 23 -------
 src/resources/resetPopup.ui           | 31 ++++++++++
 src/resources/resetUI.cmb             | 26 +++++---
 src/resources/resetWifiEntry.ui       |  3 +
 src/resources/resources.gresource.xml |  1 +
 10 files changed, 168 insertions(+), 56 deletions(-)
 delete mode 100644 src/resources/resetPasswordPopup.ui
 create mode 100644 src/resources/resetPopup.ui

diff --git a/src/components/base/popup.rs b/src/components/base/popup.rs
index a25d8e2..19d5b13 100644
--- a/src/components/base/popup.rs
+++ b/src/components/base/popup.rs
@@ -1,17 +1,17 @@
 use adw::glib;
-use adw::glib::{IsA, Object};
-use gtk::Widget;
+use adw::glib::Object;
+use gtk::{gdk, Editable, Popover};
 
 use super::popupImpl;
 
 glib::wrapper! {
     pub struct Popup(ObjectSubclass<popupImpl::Popup>)
-    @extends adw::Window, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+    @extends Popover, gtk::Widget,
+    @implements Editable,gdk::Popup, gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
 impl Popup {
-    pub fn new(child: &impl IsA<Widget>) -> Self {
+    pub fn new() -> Self {
         let popup: Popup = Object::builder().build();
         // popup.set_child(child);
         popup
diff --git a/src/components/base/popupImpl.rs b/src/components/base/popupImpl.rs
index 7bf6caf..19534ba 100644
--- a/src/components/base/popupImpl.rs
+++ b/src/components/base/popupImpl.rs
@@ -1,19 +1,35 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
+use adw::subclass::prelude::{ActionRowImpl, PreferencesRowImpl};
 use adw::subclass::window::AdwWindowImpl;
+use gtk::gdk_pixbuf::subclass::prelude::{
+    PixbufAnimationImpl, PixbufAnimationIterImpl, PixbufLoaderImpl,
+};
+use gtk::prelude::PopupExt;
 use gtk::subclass::prelude::*;
-use gtk::{glib, CompositeTemplate};
+use gtk::{
+    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, PasswordEntry, PasswordEntryBuffer, Popover,
+};
 
 use super::popup;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
-pub struct Popup {}
+pub struct Popup {
+    #[template_child]
+    pub resetPopupEntry: TemplateChild<PasswordEntry>,
+    #[template_child]
+    pub resetPopupButton: TemplateChild<Button>,
+    pub resetPopupText: Arc<RefCell<PasswordEntryBuffer>>,
+}
 
 #[glib::object_subclass]
 impl ObjectSubclass for Popup {
     const NAME: &'static str = "resetPopup";
     type Type = popup::Popup;
-    type ParentType = adw::Window;
+    type ParentType = Popover;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -30,12 +46,12 @@ impl ObjectImpl for Popup {
     }
 }
 
-impl BoxImpl for Popup {}
-
 impl WidgetImpl for Popup {}
 
-impl AdwWindowImpl for Popup {}
-
 impl WindowImpl for Popup {}
 
+impl PopoverImpl for Popup {}
+
 impl ApplicationWindowImpl for Popup {}
+
+impl EditableImpl for Popup {}
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index f98495e..c81e14d 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -109,6 +109,7 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
         }
     });
 }
+
 pub async fn wat() -> Vec<AccessPoint> {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index f2bf11b..91d1422 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -1,12 +1,15 @@
+use crate::components::base::popup::{self, Popup};
 use crate::components::wifi::wifiEntryImpl;
 use adw::glib;
 use adw::glib::{Object, PropertySet};
+use adw::prelude::{ButtonExt, EditableExt, EntryExt, PopoverExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
-use glib::clone;
+use glib::{clone, Cast};
 use gtk::prelude::WidgetExt;
-use gtk::GestureClick;
+use gtk::{AlertDialog, Editable, GestureClick, PasswordEntry, PasswordEntryBuffer, Window};
+use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
@@ -75,6 +78,14 @@ impl WifiEntry {
 }
 
 pub fn click_stored_network(entry: Arc<WifiEntry>) {
+    let alert = AlertDialog::builder().build();
+    let root = &entry.root().unwrap();
+    let root = root.downcast_ref::<gtk::Window>();
+    if root.is_none() {
+        println!("ERROR BRO");
+        return;
+    }
+    let root = root.unwrap();
     // TODO handle unknown access point -> should be done by having 2 different categories
     let entryImp = entry.imp();
     let conn = Connection::new_session().unwrap();
@@ -88,12 +99,14 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
         let res: Result<(bool,), Error> =
             proxy.method_call("org.xetibo.ReSet", "DisconnectFromCurrentAccessPoint", ());
         if res.is_err() {
-            // TODO handle error
-            println!("no worky");
+            alert.set_message("Error on connecting to dbus.");
+            alert.show(Some(root));
             return;
         }
         let (res,) = res.unwrap();
         if res == false {
+            alert.set_message("Could not disconnect from access point.");
+            alert.show(Some(root));
         } else {
             entryImp.resetWifiConnected.get().set_from_icon_name(None);
             let mut access_point = entryImp.accessPoint.borrow_mut();
@@ -108,14 +121,14 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
         (access_point,),
     );
     if res.is_err() {
-        // TODO handle error
-        println!("no worky");
+        alert.set_message("Error on connecting to dbus.");
+        alert.show(Some(root));
     } else {
         let (res,) = res.unwrap();
         if res == false {
-            println!("no worky but it connected");
+            alert.set_message("Could not connect to access point.");
+            alert.show(Some(root));
         } else {
-            println!("worky");
             entryImp
                 .resetWifiConnected
                 .get()
@@ -127,5 +140,62 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
 }
 
 pub fn click_new_network(entry: Arc<WifiEntry>) {
-    println!("Not implemented yet :)");
+    let connect_new_network =
+        |entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| -> bool {
+            let alert = AlertDialog::builder().build();
+            let root = &entry.root().unwrap();
+            let root = root.downcast_ref::<gtk::Window>();
+            if root.is_none() {
+                println!("ERROR BRO");
+                return false;
+            }
+            let root = root.unwrap();
+            let conn = Connection::new_session().unwrap();
+            let proxy = conn.with_proxy(
+                "org.xetibo.ReSet",
+                "/org/xetibo/ReSet",
+                Duration::from_millis(10000),
+            );
+            // TODO crate spinner animation and block UI
+            let res: Result<(bool,), Error> = proxy.method_call(
+                "org.xetibo.ReSet",
+                "ConnectToNewAccessPoint",
+                (access_point, password),
+            );
+            if res.is_err() {
+                alert.set_message("Could not connect to dbus.");
+                alert.show(Some(root));
+                return false;
+            }
+            if res.unwrap() == (false,) {
+                alert.set_message("Could not connect to access point.");
+                alert.show(Some(root));
+                return false;
+            }
+            true
+        };
+
+    let result = Arc::new(AtomicBool::new(false));
+    let result_ref = result.clone();
+    let entryImp = entry.imp();
+    let popupImp = entryImp.resetWifiPopup.imp();
+    popupImp
+        .resetPopupEntry
+        .connect_activate(clone!(@weak entry as origEntry, @weak entryImp => move |entry| {
+            result_ref.store(
+                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string()),
+                std::sync::atomic::Ordering::SeqCst,
+            );
+            entryImp.resetWifiPopup.popdown();
+        }));
+    popupImp
+        .resetPopupButton
+        .connect_clicked(clone!(@weak popupImp => move |_| {
+            popupImp.resetPopupEntry.activate();
+        }));
+    entryImp.resetWifiPopup.popup();
+    println!(
+        "result is {}",
+        result.load(std::sync::atomic::Ordering::SeqCst)
+    );
 }
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index b766900..4807f18 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -1,8 +1,9 @@
-use std::cell::RefCell;
-use ReSet_Lib::network::network::{WifiStrength, AccessPoint};
-use gtk::{Button, CompositeTemplate, glib, Image, Label, Gesture, GestureClick};
-use gtk::subclass::prelude::*;
+use crate::components::base::popup::Popup;
 use crate::components::wifi::wifiEntry;
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, Image, Label};
+use std::cell::RefCell;
+use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
@@ -20,6 +21,8 @@ pub struct WifiEntry {
     pub resetWifiConnected: TemplateChild<Image>,
     #[template_child]
     pub resetWifiStored: TemplateChild<Image>,
+    #[template_child]
+    pub resetWifiPopup: TemplateChild<Popup>,
     pub wifiName: RefCell<String>,
     pub wifiStrength: RefCell<WifiStrength>,
     pub accessPoint: RefCell<AccessPoint>,
diff --git a/src/resources/resetPasswordPopup.ui b/src/resources/resetPasswordPopup.ui
deleted file mode 100644
index f281b91..0000000
--- a/src/resources/resetPasswordPopup.ui
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.17.0 -->
-<interface>
-  <requires lib="gtk" version="4.12"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <template class="resetPasswordPopup" parent="AdwWindow">
-    <child>
-      <object class="GtkBox">
-        <child>
-          <object class="GtkEntry" id="resetWifiPasswordEntry">
-            <property name="activates-default">True</property>
-            <property name="invisible-char-set">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="resetWifiPasswordButton">
-            <property name="label">connect</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
new file mode 100644
index 0000000..f9461dd
--- /dev/null
+++ b/src/resources/resetPopup.ui
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <template class="resetPopup" parent="GtkPopover">
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkPasswordEntry" id="resetPopupEntry">
+            <property name="activates-default">True</property>
+            <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="placeholder-text">Wifi Password</property>
+            <property name="show-peek-icon">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetPopupButton">
+            <property name="label">connect</property>
+            <property name="margin-bottom">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-top">5</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 2b43735..e7a3469 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -14,7 +14,7 @@
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
 	(14,1,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
-	(16,1,None,"resetPasswordPopup.ui",None,None,None,None,None,None,None)
+	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -83,6 +83,7 @@
 	(5,7,"GtkButton","resetWifiButton",2,None,None,None,4,None),
 	(5,8,"GtkImage","resetWifiConnected",2,None,None,None,3,None),
 	(5,10,"GtkImage","resetWifiStored",2,None,None,None,2,None),
+	(5,11,"resetPopup","resetWifiPopup",2,None,None,None,-1,None),
 	(6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None),
 	(6,2,"GtkBox",None,1,None,None,None,-1,None),
 	(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
@@ -156,10 +157,10 @@
 	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
 	(14,1,"GtkBox","resetSetting",None,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
-	(16,1,"AdwWindow","resetPasswordPopup",None,None,None,None,-1,None),
-	(16,2,"GtkBox",None,1,None,None,None,-1,None),
-	(16,3,"GtkEntry","resetWifiPasswordEntry",2,None,None,None,-1,None),
-	(16,4,"GtkButton","resetWifiPasswordButton",2,None,None,None,-1,None)
+	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
+	(16,7,"GtkBox",None,6,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","resetPopupEntry",7,None,None,None,None,None),
+	(16,9,"GtkButton","resetPopupButton",7,None,None,None,1,None)
   </object>
   <object_property>
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
@@ -477,9 +478,18 @@
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(16,3,"GtkEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
-	(16,3,"GtkEntry","invisible-char-set","True",None,None,None,None,None,None,None,None,None),
-	(16,4,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None)
+	(16,8,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,9,"GtkWidget","margin-top","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),
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index bb12fb7..6b1d6a9 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -4,6 +4,9 @@
   <requires lib="gtk" version="4.12"/>
   <template class="resetWifiEntry" parent="GtkBox">
     <property name="margin-start">5</property>
+    <child>
+      <object class="resetPopup" id="resetWifiPopup"/>
+    </child>
     <child>
       <object class="GtkBox">
         <property name="width-request">35</property>
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index 5f0bed4..f86c757 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -13,5 +13,6 @@
     <file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetMicrophone.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetMicSourceEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
   </gresource>
 </gresources>

From bbfd07688d5ce79fd7c097d9fdee87cb7d66ffdf Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 11 Nov 2023 23:00:38 +0100
Subject: [PATCH 3/7] fix: Execute connect function with wifi connect button

---
 src/components/wifi/wifiEntry.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 91d1422..f827ec2 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -177,6 +177,7 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
 
     let result = Arc::new(AtomicBool::new(false));
     let result_ref = result.clone();
+    let result_ref_button = result.clone();
     let entryImp = entry.imp();
     let popupImp = entryImp.resetWifiPopup.imp();
     popupImp
@@ -190,8 +191,13 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
         }));
     popupImp
         .resetPopupButton
-        .connect_clicked(clone!(@weak popupImp => move |_| {
-            popupImp.resetPopupEntry.activate();
+        .connect_clicked(clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
+            let entry = entryImp.resetWifiPopup.imp().resetPopupEntry.text().to_string();
+            result_ref_button.store(
+                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry),
+                std::sync::atomic::Ordering::SeqCst,
+            );
+            entryImp.resetWifiPopup.popdown();
         }));
     entryImp.resetWifiPopup.popup();
     println!(

From 9cad376a400cfe8ebf909efa408b1f9ceacb3581 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 03:41:29 +0100
Subject: [PATCH 4/7] feat: Add saved WifiList

---
 src/components/base/popupImpl.rs            |  8 +-
 src/components/wifi/mod.rs                  |  4 +-
 src/components/wifi/savedWifiEntry.rs       | 46 ++++++++++
 src/components/wifi/savedWifiEntryImpl.rs   | 52 +++++++++++
 src/components/wifi/wifiBox.rs              | 79 ++++++++++++++---
 src/components/wifi/wifiBoxImpl.rs          |  3 +
 src/components/wifi/wifiEntry.rs            | 98 +++++++++++----------
 src/components/window/handleSidebarClick.rs | 38 ++++----
 src/resources/resetPopup.ui                 | 39 +++++---
 src/resources/resetSavedWifiEntry.ui        | 23 +++++
 src/resources/resetUI.cmb                   | 75 ++++++++++------
 src/resources/resetWiFi.ui                  | 32 +++++--
 src/resources/resources.gresource.xml       |  1 +
 13 files changed, 372 insertions(+), 126 deletions(-)
 create mode 100644 src/components/wifi/savedWifiEntry.rs
 create mode 100644 src/components/wifi/savedWifiEntryImpl.rs
 create mode 100644 src/resources/resetSavedWifiEntry.ui

diff --git a/src/components/base/popupImpl.rs b/src/components/base/popupImpl.rs
index 19534ba..ecf032b 100644
--- a/src/components/base/popupImpl.rs
+++ b/src/components/base/popupImpl.rs
@@ -9,7 +9,8 @@ use gtk::gdk_pixbuf::subclass::prelude::{
 use gtk::prelude::PopupExt;
 use gtk::subclass::prelude::*;
 use gtk::{
-    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, PasswordEntry, PasswordEntryBuffer, Popover,
+    gdk, glib, Button, CompositeTemplate, Entry, EntryBuffer, Label, PasswordEntry,
+    PasswordEntryBuffer, Popover,
 };
 
 use super::popup;
@@ -18,6 +19,8 @@ use super::popup;
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetPopup.ui")]
 pub struct Popup {
+    #[template_child]
+    pub resetPopupLabel: TemplateChild<Label>,
     #[template_child]
     pub resetPopupEntry: TemplateChild<PasswordEntry>,
     #[template_child]
@@ -25,6 +28,9 @@ pub struct Popup {
     pub resetPopupText: Arc<RefCell<PasswordEntryBuffer>>,
 }
 
+unsafe impl Send for Popup {}
+unsafe impl Sync for Popup {}
+
 #[glib::object_subclass]
 impl ObjectSubclass for Popup {
     const NAME: &'static str = "resetPopup";
diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs
index 7a65bcb..f740b0b 100644
--- a/src/components/wifi/mod.rs
+++ b/src/components/wifi/mod.rs
@@ -1,5 +1,7 @@
 #![allow(non_snake_case)]
+pub mod savedWifiEntry;
 pub mod wifiBox;
 pub mod wifiBoxImpl;
 pub mod wifiEntry;
-pub mod wifiEntryImpl;
\ No newline at end of file
+pub mod wifiEntryImpl;
+pub mod savedWifiEntryImpl;
diff --git a/src/components/wifi/savedWifiEntry.rs b/src/components/wifi/savedWifiEntry.rs
new file mode 100644
index 0000000..9983778
--- /dev/null
+++ b/src/components/wifi/savedWifiEntry.rs
@@ -0,0 +1,46 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use crate::components::wifi::savedWifiEntryImpl;
+use adw::glib;
+use adw::glib::Object;
+use adw::prelude::{ButtonExt, WidgetExt};
+use dbus::{Error, Path};
+use dbus::blocking::Connection;
+use glib::{clone, PropertySet};
+use glib::subclass::types::ObjectSubclassIsExt;
+
+glib::wrapper! {
+    pub struct SavedWifiEntry(ObjectSubclass<savedWifiEntryImpl::SavedWifiEntry>)
+        @extends gtk::Box, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
+}
+
+impl SavedWifiEntry {
+    pub fn new(name: &String, path: Path<'static>) -> Self {
+        let entry: SavedWifiEntry = Object::builder().build();
+        let entryImp = entry.imp();
+        // TODO handle edit
+        entryImp.resetSavedWifiLabel.set_text(name);
+        entryImp.resetConnectionPath.set(path);
+        entryImp.resetDeleteSavedWifiButton.connect_clicked(clone!(@weak entry as entry => move |_| {
+        let conn = Connection::new_session().unwrap();
+        let proxy = conn.with_proxy(
+            "org.xetibo.ReSet",
+            "/org/xetibo/ReSet",
+            Duration::from_millis(1000),
+        );
+        let res: Result<(bool,), Error> = proxy.method_call("org.xetibo.ReSet", "DeleteConnection", (entry.imp().resetConnectionPath.take(),));
+        if res.is_err() || res.unwrap() == (false,) { 
+            // TODO handle error -> inform user
+            println!("no worky");
+           return; 
+        }
+        println!("worked, should be ded");
+        let parent = entry.parent().unwrap();
+        parent.set_visible(false);
+        parent.unparent();
+        }));
+        entry
+    }
+}
diff --git a/src/components/wifi/savedWifiEntryImpl.rs b/src/components/wifi/savedWifiEntryImpl.rs
new file mode 100644
index 0000000..45b9898
--- /dev/null
+++ b/src/components/wifi/savedWifiEntryImpl.rs
@@ -0,0 +1,52 @@
+use std::cell::RefCell;
+
+use dbus::Path;
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, Label};
+
+use super::savedWifiEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetSavedWifiEntry.ui")]
+pub struct SavedWifiEntry {
+    #[template_child]
+    pub resetDeleteSavedWifiButton: TemplateChild<Button>,
+    #[template_child]
+    pub resetEditSavedWifiButton: TemplateChild<Button>,
+    #[template_child]
+    pub resetSavedWifiLabel: TemplateChild<Label>,
+    pub resetConnectionPath: RefCell<Path<'static>>,
+}
+
+unsafe impl Send for SavedWifiEntry {}
+unsafe impl Sync for SavedWifiEntry {}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SavedWifiEntry {
+    const NAME: &'static str = "resetSavedWifiEntry";
+    type Type = savedWifiEntry::SavedWifiEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for SavedWifiEntry {
+    fn constructed(&self) {
+        self.parent_constructed();
+    }
+}
+
+impl BoxImpl for SavedWifiEntry {}
+
+impl WidgetImpl for SavedWifiEntry {}
+
+impl WindowImpl for SavedWifiEntry {}
+
+impl ApplicationWindowImpl for SavedWifiEntry {}
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index c81e14d..b40ffed 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -6,12 +6,14 @@ use std::time::Duration;
 use crate::components::base::listEntry::ListEntry;
 use adw::glib;
 use adw::glib::Object;
+use adw::prelude::{BoxExt, ButtonExt, ListBoxRowExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
 use dbus::Path;
 use gtk::glib::{clone, Variant};
 use gtk::prelude::ActionableExt;
+use gtk::{Button, Label, Orientation};
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 use ReSet_Lib::signals::{
     AccessPointAdded, AccessPointRemoved, BluetoothDeviceAdded, BluetoothDeviceRemoved,
@@ -21,6 +23,8 @@ use ReSet_Lib::utils::Events;
 use crate::components::wifi::wifiBoxImpl;
 use crate::components::wifi::wifiEntry::WifiEntry;
 
+use super::savedWifiEntry::SavedWifiEntry;
+
 glib::wrapper! {
     pub struct WifiBox(ObjectSubclass<wifiBoxImpl::WifiBox>)
     @extends gtk::Box, gtk::Widget,
@@ -46,18 +50,18 @@ impl WifiBox {
             .set_action_target_value(Some(&Variant::from("saved")));
     }
 
-    pub fn donotdisturb() {
-        thread::spawn(|| {
-            let conn = Connection::new_session().unwrap();
-            let proxy = conn.with_proxy(
-                "org.freedesktop.Notifications",
-                "/org/freedesktop/Notifications",
-                Duration::from_millis(1000),
-            );
-            let _: Result<(), Error> =
-                proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
-        });
-    }
+    // pub fn donotdisturb() {
+    //     thread::spawn(|| {
+    //         let conn = Connection::new_session().unwrap();
+    //         let proxy = conn.with_proxy(
+    //             "org.freedesktop.Notifications",
+    //             "/org/freedesktop/Notifications",
+    //             Duration::from_millis(1000),
+    //         );
+    //         let _: Result<(), Error> =
+    //             proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
+    //     });
+    // }
 }
 
 pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
@@ -65,7 +69,7 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
     let wifiEntries = wifiBox.imp().wifiEntries.clone();
 
     glib::spawn_future_local(async move {
-        let accessPoints = wat().await;
+        let accessPoints = get_access_points().await;
         let wifiEntries = wifiEntries.clone();
         {
             let mut wifiEntries = wifiEntries.lock().unwrap();
@@ -110,7 +114,36 @@ pub fn scanForWifi(wifiBox: Arc<WifiBox>) {
     });
 }
 
-pub async fn wat() -> Vec<AccessPoint> {
+pub fn show_stored_connections(wifiBox: Arc<WifiBox>) {
+    let wifibox_ref = wifiBox.clone();
+    let wifiEntries = wifiBox.imp().savedWifiEntries.clone();
+
+    glib::spawn_future_local(async move {
+        let connections = get_stored_connections().await;
+        let wifiEntries = wifiEntries.clone();
+        {
+            let mut wifiEntries = wifiEntries.lock().unwrap();
+            for connection in connections {
+                // TODO include button for settings
+                let name = &String::from_utf8(connection.1).unwrap_or_else(|_| String::from(""));
+                let entry = ListEntry::new(&SavedWifiEntry::new(name, connection.0));
+                entry.set_activatable(false);
+                wifiEntries.push(entry);
+            }
+        }
+        glib::MainContext::default().spawn_local(async move {
+            glib::idle_add_once(move || {
+                let wifiEntries = wifiEntries.lock().unwrap();
+                let selfImp = wifibox_ref.imp();
+                for wifiEntry in wifiEntries.iter() {
+                    selfImp.resetStoredWifiList.append(wifiEntry);
+                }
+            });
+        });
+    });
+}
+
+pub async fn get_access_points() -> Vec<AccessPoint> {
     let conn = Connection::new_session().unwrap();
     let proxy = conn.with_proxy(
         "org.xetibo.ReSet",
@@ -125,3 +158,21 @@ pub async fn wat() -> Vec<AccessPoint> {
     let (accessPoints,) = res.unwrap();
     accessPoints
 }
+
+pub async fn get_stored_connections() -> Vec<(Path<'static>, Vec<u8>)> {
+    let conn = Connection::new_session().unwrap();
+    let proxy = conn.with_proxy(
+        "org.xetibo.ReSet",
+        "/org/xetibo/ReSet",
+        Duration::from_millis(1000),
+    );
+    let res: Result<(Vec<(Path<'static>, Vec<u8>)>,), Error> =
+        proxy.method_call("org.xetibo.ReSet", "ListStoredConnections", ());
+    if res.is_err() {
+        println!("we got error...");
+        return Vec::new();
+    }
+    let (connections,) = res.unwrap();
+    dbg!(connections.clone());
+    connections
+}
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index cb8cca6..ebb1d67 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -26,7 +26,10 @@ pub struct WifiBox {
     pub resetWifiList: TemplateChild<ListBox>,
     #[template_child]
     pub resetWifiAdvanced: TemplateChild<Button>,
+    #[template_child]
+    pub resetStoredWifiList: TemplateChild<ListBox>,
     pub wifiEntries: Arc<Mutex<Vec<ListEntry>>>,
+    pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
 }
 
 unsafe impl Send for WifiBox {}
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index f827ec2..48daa74 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -141,38 +141,54 @@ pub fn click_stored_network(entry: Arc<WifiEntry>) {
 
 pub fn click_new_network(entry: Arc<WifiEntry>) {
     let connect_new_network =
-        |entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| -> bool {
-            let alert = AlertDialog::builder().build();
-            let root = &entry.root().unwrap();
-            let root = root.downcast_ref::<gtk::Window>();
-            if root.is_none() {
-                println!("ERROR BRO");
-                return false;
-            }
-            let root = root.unwrap();
-            let conn = Connection::new_session().unwrap();
-            let proxy = conn.with_proxy(
-                "org.xetibo.ReSet",
-                "/org/xetibo/ReSet",
-                Duration::from_millis(10000),
-            );
+        |result: Arc<AtomicBool>, entry: Arc<WifiEntry>, access_point: AccessPoint, password: String| {
+            let entry_ref = entry.clone();
+            let popup = entry.imp().resetWifiPopup.imp();
+            popup.resetPopupLabel.set_text("Connecting...");
+            popup.resetPopupLabel.set_visible(true);
+            popup.resetPopupEntry.set_sensitive(false);
+            popup.resetPopupButton.set_sensitive(false);
+
+            glib::spawn_future_local(async move {
+                let conn = Connection::new_session().unwrap();
+                let proxy = conn.with_proxy(
+                    "org.xetibo.ReSet",
+                    "/org/xetibo/ReSet",
+                    Duration::from_millis(10000),
+                );
+                let res: Result<(bool,), Error> = proxy.method_call(
+                    "org.xetibo.ReSet",
+                    "ConnectToNewAccessPoint",
+                    (access_point, password),
+                );
+                glib::MainContext::default().spawn_local(async move {
+                    glib::idle_add_once(move || {
+                        if res.is_err() {
+                            entry_ref
+                                .imp()
+                                .resetWifiPopup
+                                .imp()
+                                .resetPopupLabel
+                                .set_text("Could not connect to dbus.");
+                            result.store(false, std::sync::atomic::Ordering::SeqCst);
+                            return;
+                        }
+                        if res.unwrap() == (false,) {
+                            entry_ref
+                                .imp()
+                                .resetWifiPopup
+                                .imp()
+                                .resetPopupLabel
+                                .set_text("Could not connect to access point.");
+                            result.store(false, std::sync::atomic::Ordering::SeqCst);
+                            return;
+                        }
+                        entry_ref.imp().resetWifiPopup.popdown();
+                        result.store(true, std::sync::atomic::Ordering::SeqCst);
+                    });
+                });
+            });
             // TODO crate spinner animation and block UI
-            let res: Result<(bool,), Error> = proxy.method_call(
-                "org.xetibo.ReSet",
-                "ConnectToNewAccessPoint",
-                (access_point, password),
-            );
-            if res.is_err() {
-                alert.set_message("Could not connect to dbus.");
-                alert.show(Some(root));
-                return false;
-            }
-            if res.unwrap() == (false,) {
-                alert.set_message("Could not connect to access point.");
-                alert.show(Some(root));
-                return false;
-            }
-            true
         };
 
     let result = Arc::new(AtomicBool::new(false));
@@ -183,22 +199,14 @@ pub fn click_new_network(entry: Arc<WifiEntry>) {
     popupImp
         .resetPopupEntry
         .connect_activate(clone!(@weak entry as origEntry, @weak entryImp => move |entry| {
-            result_ref.store(
-                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string()),
-                std::sync::atomic::Ordering::SeqCst,
-            );
-            entryImp.resetWifiPopup.popdown();
+                connect_new_network(result_ref.clone(), origEntry, entryImp.accessPoint.clone().take(), entry.text().to_string());
         }));
-    popupImp
-        .resetPopupButton
-        .connect_clicked(clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
+    popupImp.resetPopupButton.connect_clicked(
+        clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| {
             let entry = entryImp.resetWifiPopup.imp().resetPopupEntry.text().to_string();
-            result_ref_button.store(
-                connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry),
-                std::sync::atomic::Ordering::SeqCst,
-            );
-            entryImp.resetWifiPopup.popdown();
-        }));
+                connect_new_network(result_ref_button.clone(), origEntry, entryImp.accessPoint.clone().take(), entry);
+        }),
+    );
     entryImp.resetWifiPopup.popup();
     println!(
         "result is {}",
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index b59ea13..d1ee541 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -1,13 +1,17 @@
 use std::sync::Arc;
 
-use gtk::{FlowBox, Label};
 use crate::components::audio::audioBox::AudioBox;
-use crate::components::bluetooth::bluetoothBox::BluetoothBox;
 use crate::components::base::settingBox::SettingBox;
-use crate::components::wifi::wifiBox::{WifiBox, scanForWifi};
+use crate::components::bluetooth::bluetoothBox::BluetoothBox;
+use crate::components::wifi::wifiBox::{scanForWifi, show_stored_connections, WifiBox};
+use adw::prelude::ButtonExt;
+use glib::clone;
+use glib::subclass::types::ObjectSubclassIsExt;
+use gtk::{FlowBox, Label};
 
-pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let wifiBox = Arc::new(WifiBox::new());
+    show_stored_connections(wifiBox.clone());
     scanForWifi(wifiBox.clone());
     let wifiBox = SettingBox::new(&*wifiBox);
     let bluetoothBox = SettingBox::new(&BluetoothBox::new());
@@ -17,74 +21,76 @@ pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     resetMain.set_max_children_per_line(2);
 };
 
-pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let wifiBox = SettingBox::new(&WifiBox::new());
+pub const HANDLE_WIFI_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
+    let wifiBox = Arc::new(WifiBox::new());
+    scanForWifi(wifiBox.clone());
+    let wifiBox = SettingBox::new(&*wifiBox);
     resetMain.remove_all();
     resetMain.insert(&wifiBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let bluetoothBox = SettingBox::new(&BluetoothBox::new());
     resetMain.remove_all();
     resetMain.insert(&bluetoothBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_VPN_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_VPN_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_AUDIO_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_AUDIO_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let audioBox = AudioBox::new();
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_VOLUME_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_VOLUME_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let audioBox = AudioBox::new();
     resetMain.remove_all();
     resetMain.insert(&audioBox, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_HOME: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_HOME: fn(FlowBox) = |resetMain: FlowBox| {
     resetMain.remove_all();
 };
 
-pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MONITOR_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MONITOR_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_MOUSE_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_MOUSE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
+pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
     resetMain.insert(&label, -1);
diff --git a/src/resources/resetPopup.ui b/src/resources/resetPopup.ui
index f9461dd..ea2b49c 100644
--- a/src/resources/resetPopup.ui
+++ b/src/resources/resetPopup.ui
@@ -5,24 +5,35 @@
   <template class="resetPopup" parent="GtkPopover">
     <child>
       <object class="GtkBox">
+        <property name="homogeneous">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkPasswordEntry" id="resetPopupEntry">
-            <property name="activates-default">True</property>
-            <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="placeholder-text">Wifi Password</property>
-            <property name="show-peek-icon">True</property>
+          <object class="GtkLabel" id="resetPopupLabel">
+            <property name="visible">False</property>
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="resetPopupButton">
-            <property name="label">connect</property>
-            <property name="margin-bottom">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-top">5</property>
+          <object class="GtkBox">
+            <child>
+              <object class="GtkPasswordEntry" id="resetPopupEntry">
+                <property name="activates-default">True</property>
+                <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="placeholder-text">Wifi Password</property>
+                <property name="show-peek-icon">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="resetPopupButton">
+                <property name="label">connect</property>
+                <property name="margin-bottom">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-top">5</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
new file mode 100644
index 0000000..5827447
--- /dev/null
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.12"/>
+  <template class="resetSavedWifiEntry" parent="GtkBox">
+    <property name="spacing">5</property>
+    <child>
+      <object class="GtkButton" id="resetDeleteSavedWifiButton">
+        <property name="has-frame">False</property>
+        <property name="icon-name">user-trash-symbolic</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="resetEditSavedWifiButton">
+        <property name="has-frame">False</property>
+        <property name="icon-name">document-edit-symbolic</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="resetSavedWifiLabel"/>
+    </child>
+  </template>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index e7a3469..ef87236 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -14,7 +14,8 @@
 	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
 	(14,1,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)
+	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
+	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <object>
 	(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1,"  &lt;child&gt;\n    &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n    &lt;/object&gt;\n  &lt;/child&gt;"),
@@ -65,8 +66,6 @@
 	(4,108,"GtkLabel",None,107,None,None,None,-1,None),
 	(4,109,"GtkButton",None,107,None,None,None,1,None),
 	(4,110,"GtkBox",None,105,None,None,None,1,None),
-	(4,111,"GtkLabel",None,110,None,None,None,None,None),
-	(4,112,"GtkButton",None,110,None,None,None,1,None),
 	(4,113,"resetListBoxRow","resetWifiSwitchRow",89,None,None,None,None,None),
 	(4,114,"GtkBox",None,113,None,None,None,None,None),
 	(4,115,"GtkLabel",None,114,None,None,None,None,None),
@@ -75,6 +74,10 @@
 	(4,121,"GtkBox",None,117,None,None,None,1,None),
 	(4,122,"GtkLabel",None,121,None,None,None,None,None),
 	(4,123,"GtkImage",None,121,None,None,None,1,None),
+	(4,124,"GtkListBox","resetStoredWifiList",110,None,None,None,1,None),
+	(4,125,"GtkBox",None,110,None,None,None,None,None),
+	(4,126,"GtkLabel",None,125,None,None,None,None,None),
+	(4,127,"GtkButton",None,125,None,None,None,1,None),
 	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
 	(5,3,"GtkBox",None,2,None,None,None,None,None),
 	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
@@ -159,8 +162,14 @@
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
 	(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
 	(16,7,"GtkBox",None,6,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","resetPopupEntry",7,None,None,None,None,None),
-	(16,9,"GtkButton","resetPopupButton",7,None,None,None,1,None)
+	(16,10,"GtkBox",None,7,None,None,None,1,None),
+	(16,11,"GtkPasswordEntry","resetPopupEntry",10,None,None,None,None,None),
+	(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None),
+	(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None),
+	(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
+	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,2,None),
+	(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
+	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
   </object>
   <object_property>
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
@@ -259,8 +268,6 @@
 	(4,102,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,102,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,102,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(4,103,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(4,103,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -274,13 +281,8 @@
 	(4,109,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,109,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(4,109,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,111,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,112,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,110,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
+	(4,110,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,114,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(4,115,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
 	(4,115,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
@@ -296,6 +298,19 @@
 	(4,123,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(4,123,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,123,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,124,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,126,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,127,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
@@ -478,18 +493,26 @@
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(16,8,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(16,9,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
+	(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
+	(16,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,11,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(16,12,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(16,13,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
+	(17,1,"GtkBox","spacing","5",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index b7ff4e9..08e68b2 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -107,8 +107,6 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="resetWifiAdvanced">
-                    <property name="action-name">navigation.push</property>
-                    <property name="action-target">'advanced'</property>
                     <property name="halign">start</property>
                     <property name="label">Advanced</property>
                     <property name="margin-start">5</property>
@@ -149,18 +147,34 @@
             <property name="tag">saved</property>
             <child>
               <object class="GtkBox">
+                <property name="homogeneous">True</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="label">saved networks</property>
+                  <object class="GtkBox">
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label">saved networks</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton">
+                        <property name="action-name">navigation.pop</property>
+                        <property name="halign">start</property>
+                        <property name="label">back</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="valign">start</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton">
-                    <property name="action-name">navigation.pop</property>
-                    <property name="halign">start</property>
-                    <property name="label">back</property>
+                  <object class="GtkListBox" id="resetStoredWifiList">
+                    <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>
                 </child>
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index f86c757..9cb6eba 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -7,6 +7,7 @@
     <file compressed="true" preprocess="xml-stripblanks">resetListBoxRow.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetWiFi.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetWifiEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetSavedWifiEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>

From 59a6a9a14d7ecf173f84defdabda16616d4e83ba Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 12:42:06 +0100
Subject: [PATCH 5/7] chore: Update cmb file

---
 src/resources/resetAudio.ui        |  1 -
 src/resources/resetMainWindow.ui   | 30 +++++++++++++++++-------------
 src/resources/resetMicrophone.ui   |  1 -
 src/resources/resetSettingBox.ui   |  7 ++++++-
 src/resources/resetSidebarEntry.ui |  1 +
 src/resources/resetUI.cmb          | 27 ++++++++++++++++-----------
 6 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudio.ui
index 9caf71a..c4286b5 100644
--- a/src/resources/resetAudio.ui
+++ b/src/resources/resetAudio.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetAudio" parent="GtkBox">
     <property name="halign">center</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 0e51506..e7aae12 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -6,6 +6,8 @@
   <template class="resetUI" parent="AdwApplicationWindow">
     <property name="default-height">500</property>
     <property name="default-width">800</property>
+    <property name="height-request">200</property>
+    <property name="width-request">600</property>
     <child>
       <object class="GtkWindowHandle"/>
     </child>
@@ -13,19 +15,15 @@
       <object class="AdwOverlaySplitView" id="resetOverlaySplitView">
         <property name="content">
           <object class="GtkBox">
+            <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="GtkWindowHandle">
                 <child>
                   <object class="GtkBox">
                     <property name="valign">start</property>
-                    <child>
-                      <object class="GtkButton" id="resetSideBarToggle">
-                        <property name="icon-name">sidebar-show-symbolic</property>
-                        <property name="visible">False</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkButton" id="resetBack">
                         <property name="has-frame">False</property>
@@ -33,6 +31,12 @@
                         <property name="valign">start</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="resetSideBarToggle">
+                        <property name="icon-name">sidebar-show-symbolic</property>
+                        <property name="visible">False</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkButton" id="resetForward">
                         <property name="has-frame">False</property>
@@ -89,9 +93,9 @@
                               <object class="GtkBox">
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkButton" id="resetPreferenceButton">
+                                  <object class="GtkButton" id="resetShortcutsButton">
                                     <property name="has-frame">False</property>
-                                    <property name="label">Preferences</property>
+                                    <property name="label">Shortcuts</property>
                                   </object>
                                 </child>
                                 <child>
@@ -101,9 +105,9 @@
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkButton" id="resetShortcutsButton">
+                                  <object class="GtkButton" id="resetPreferenceButton">
                                     <property name="has-frame">False</property>
-                                    <property name="label">Shortcuts</property>
+                                    <property name="label">Preferences</property>
                                   </object>
                                 </child>
                               </object>
@@ -151,13 +155,12 @@
             </child>
           </object>
         </property>
-        <property name="margin-end">5</property>
-        <property name="margin-start">5</property>
-        <property name="margin-top">5</property>
         <property name="max-sidebar-width">180.0</property>
         <property name="sidebar">
           <object class="GtkBox">
             <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="GtkWindowHandle">
@@ -172,6 +175,7 @@
             </child>
             <child>
               <object class="GtkScrolledWindow">
+                <property name="margin-top">5</property>
                 <property name="propagate-natural-height">True</property>
                 <child>
                   <object class="GtkViewport">
diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetMicrophone.ui
index cb862d2..1e5f6b4 100644
--- a/src/resources/resetMicrophone.ui
+++ b/src/resources/resetMicrophone.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk" version="4.6"/>
   <template class="resetMicrophone" parent="GtkBox">
     <property name="halign">start</property>
-    <property name="margin-start">5</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">400</property>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 1c51a92..0d9df5d 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -2,10 +2,15 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="resetSetting" parent="GtkBox">
+  <template class="resetSettingFrame" parent="GtkBox">
     <property name="halign">center</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
     <property name="width-request">500</property>
+    <child>
+      <object class="GtkLabel" id="resetSettingLabel">
+        <property name="css-classes">resetSettingLabel</property>
+      </object>
+    </child>
   </template>
 </interface>
diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui
index 6c4cd41..9b39fe7 100644
--- a/src/resources/resetSidebarEntry.ui
+++ b/src/resources/resetSidebarEntry.ui
@@ -18,5 +18,6 @@
         </child>
       </object>
     </property>
+    <property name="css-classes">resetSidebarEntry</property>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index ef87236..ff656a1 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -27,16 +27,16 @@
 	(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None),
 	(3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
 	(3,25,"GtkBox",None,24,None,None,None,None,None),
-	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None),
-	(3,27,"GtkButton","resetBack",25,None,None,None,1,None),
+	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,1,None),
+	(3,27,"GtkButton","resetBack",25,None,None,None,None,None),
 	(3,28,"GtkButton","resetForward",25,None,None,None,2,None),
 	(3,31,"GtkButton","resetClose",25,None,None,None,5,None),
 	(3,33,"GtkMenuButton",None,25,None,None,None,4,None),
 	(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
 	(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
 	(3,36,"GtkBox",None,35,None,None,None,-1,None),
-	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None),
-	(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
+	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,2,None),
+	(3,39,"GtkButton","resetAboutButton",36,None,None,None,1,None),
 	(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
 	(3,41,"GtkViewport",None,40,None,None,None,None,None),
 	(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None),
@@ -48,7 +48,7 @@
 	(3,48,"GtkButton",None,34,None,None,None,4,None),
 	(3,49,"GtkLabel",None,34,None,None,None,1,None),
 	(3,50,"GtkLabel",None,34,None,None,None,3,None),
-	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,2,None),
+	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,70,"AdwNavigationView",None,7,None,None,None,-1,None),
 	(4,71,"AdwNavigationPage",None,70,None,None,None,-1,None),
@@ -158,7 +158,8 @@
 	(13,8,"GtkAdjustment",None,7,None,None,None,None,None),
 	(13,9,"GtkLabel","resetMicPercentage",5,None,None,None,2,None),
 	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
-	(14,1,"GtkBox","resetSetting",None,None,None,None,-1,None),
+	(14,1,"GtkBox","resetSettingFrame",None,None,None,None,-1,None),
+	(14,2,"GtkLabel","resetSettingLabel",1,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),
 	(16,7,"GtkBox",None,6,None,None,None,None,None),
@@ -172,18 +173,21 @@
 	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
   </object>
   <object_property>
+	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
+	(3,1,"GtkWidget","width-request","600",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-height","500",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkWindow","default-width","800",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","content",None,None,None,None,None,3,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","max-sidebar-width","180.0",None,None,None,None,None,None,None,None,None),
 	(3,2,"AdwOverlaySplitView","sidebar",None,None,None,None,None,18,None,None,None,None),
-	(3,2,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(3,2,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,3,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,19,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkSearchEntry","placeholder-text","Search",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
@@ -220,6 +224,7 @@
 	(3,39,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,39,"GtkButton","label","About",None,None,None,None,None,None,None,None,None),
 	(3,40,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(3,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
 	(3,43,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
@@ -335,6 +340,7 @@
 	(5,10,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(5,10,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(6,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None),
+	(6,1,"GtkWidget","css-classes","resetSidebarEntry",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(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),
@@ -362,7 +368,6 @@
 	(7,12,"GtkWidget","width-request","40",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","halign","center",None,None,None,None,None,None,None,None,None),
-	(8,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
 	(8,14,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -449,7 +454,6 @@
 	(11,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(12,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
 	(12,2,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
@@ -491,6 +495,7 @@
 	(14,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(14,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(14,1,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
+	(14,2,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),

From d07180e2c76a5ef0e9101555df7e9f0c42376027 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 12 Nov 2023 13:17:19 +0100
Subject: [PATCH 6/7] fix: Merge

---
 src/components/wifi/wifiBox.rs              |  4 +-
 src/components/wifi/wifiBoxImpl.rs          |  2 -
 src/components/window/handleSidebarClick.rs |  4 --
 src/resources/resetMainWindow.ui            | 12 +++---
 src/resources/resetSettingBox.ui            |  5 ---
 src/resources/resetUI.cmb                   | 48 ++++++++-------------
 src/resources/resetWiFi.ui                  | 34 ---------------
 7 files changed, 26 insertions(+), 83 deletions(-)

diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 24b063e..9559042 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -43,8 +43,8 @@ impl WifiBox {
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
 
-        selfImp.resetWifiSwitchRow.set_action_name(Some("navigation.push"));
-        selfImp.resetWifiSwitchRow.set_action_target_value(Some(&Variant::from("saved")))
+        selfImp.resetSavedNetworks.set_action_name(Some("navigation.push"));
+        selfImp.resetSavedNetworks.set_action_target_value(Some(&Variant::from("saved")))
     }
 
     // pub fn donotdisturb() {
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index ebb1d67..377b1c3 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -25,8 +25,6 @@ pub struct WifiBox {
     #[template_child]
     pub resetWifiList: TemplateChild<ListBox>,
     #[template_child]
-    pub resetWifiAdvanced: TemplateChild<Button>,
-    #[template_child]
     pub resetStoredWifiList: TemplateChild<ListBox>,
     pub wifiEntries: Arc<Mutex<Vec<ListEntry>>>,
     pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index a1766ca..cd44978 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -65,10 +65,6 @@ pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     resetMain.set_max_children_per_line(1);
 };
 
-pub const HANDLE_HOME: fn(FlowBox) = |resetMain: FlowBox| {
-    resetMain.remove_all();
-};
-
 pub const HANDLE_PERIPHERALS_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let label = Label::new(Some("not implemented yet"));
     resetMain.remove_all();
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 779ed80..e7aae12 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -98,18 +98,18 @@
                                     <property name="label">Shortcuts</property>
                                   </object>
                                 </child>
-                                <child>
-                                  <object class="GtkButton" id="resetPreferenceButton">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">Preferences</property>
-                                  </object>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="resetAboutButton">
                                     <property name="has-frame">False</property>
                                     <property name="label">About</property>
                                   </object>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" id="resetPreferenceButton">
+                                    <property name="has-frame">False</property>
+                                    <property name="label">Preferences</property>
+                                  </object>
+                                </child>
                               </object>
                             </property>
                           </object>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 2fa73fb..44c5edb 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -11,10 +11,5 @@
       </object>
     </property>
     <property name="width-request">500</property>
-    <child>
-      <object class="GtkLabel" id="resetSettingLabel">
-        <property name="css-classes">resetSettingLabel</property>
-      </object>
-    </child>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index a980c51..e4d4749 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -67,15 +67,12 @@
 	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
 	(4,167,"GtkViewport",None,166,None,None,None,None,None),
 	(4,168,"GtkListBox","resetWifiList",167,None,None,None,None,None),
-	(4,169,"GtkButton","resetWifiAdvanced",154,None,None,None,2,None),
-	(4,170,"AdwNavigationPage",None,152,None,None,None,1,None),
-	(4,171,"GtkBox",None,170,None,None,None,None,None),
-	(4,172,"GtkLabel",None,171,None,None,None,None,None),
-	(4,173,"GtkButton",None,171,None,None,None,1,None),
 	(4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
 	(4,175,"GtkBox",None,174,None,None,None,None,None),
-	(4,176,"GtkLabel",None,175,None,None,None,None,None),
-	(4,177,"GtkButton",None,175,None,None,None,1,None),
+	(4,178,"GtkListBox","resetStoredWifiList",175,None,None,None,3,None),
+	(4,179,"GtkBox",None,175,None,None,None,None,None),
+	(4,180,"GtkLabel",None,179,None,None,None,None,None),
+	(4,181,"GtkButton",None,179,None,None,None,1,None),
 	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
 	(5,3,"GtkBox",None,2,None,None,None,None,None),
 	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
@@ -284,30 +281,21 @@
 	(4,168,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,169,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,170,"AdwNavigationPage","child",None,None,None,None,None,171,None,None,None,None),
-	(4,170,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
-	(4,172,"GtkLabel","label","advanced page",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,173,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
-	(4,176,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,177,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,180,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(4,181,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 08e68b2..9bcda9d 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -105,49 +105,15 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkButton" id="resetWifiAdvanced">
-                    <property name="halign">start</property>
-                    <property name="label">Advanced</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
         </child>
-        <child>
-          <object class="AdwNavigationPage">
-            <property name="child">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">advanced page</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="action-name">navigation.pop</property>
-                    <property name="halign">start</property>
-                    <property name="label">back</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
-              </object>
-            </property>
-            <property name="tag">advanced</property>
-          </object>
-        </child>
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">saved</property>
             <child>
               <object class="GtkBox">
-                <property name="homogeneous">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">

From 35c58e2fcd4676b48d1da860b16fbc6dd744bd73 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 12 Nov 2023 17:43:01 +0100
Subject: [PATCH 7/7] Implement Microphone UI Improve Audio UI You won't
 believe what happened (gone sexual)

---
 src/components/base/settingBox.rs             |  10 +-
 src/components/base/settingBoxImpl.rs         |  11 +-
 src/components/bluetooth/bluetoothBox.rs      |  10 +
 src/components/bluetooth/bluetoothBoxImpl.rs  |   5 +
 src/components/bluetooth/bluetoothEntry.rs    |   2 +-
 .../audioBox.rs => input/inputStreamEntry.rs} |   6 +-
 src/components/input/inputStreamEntryImpl.rs  |  40 ++
 src/components/input/mod.rs                   |   5 +
 src/components/input/sourceBox.rs             |  26 +
 src/components/input/sourceBoxImpl.rs         |  52 ++
 src/components/mod.rs                         |   5 +-
 src/components/output/audioBox.rs             |  27 +
 .../{audio => output}/audioBoxImpl.rs         |  19 +-
 .../{audio => output}/audioSource.rs          |   2 +-
 .../{audio => output}/audioSourceImpl.rs      |   8 +-
 src/components/{audio => output}/mod.rs       |   0
 src/components/wifi/wifiBox.rs                |  45 +-
 src/components/wifi/wifiBoxImpl.rs            |   9 +-
 src/components/wifi/wifiEntry.rs              |  25 +-
 src/components/wifi/wifiEntryImpl.rs          |   5 +-
 src/components/window/handleSidebarClick.rs   |  50 +-
 src/components/window/window.rs               |   4 +-
 src/resources/resetAudio.ui                   | 226 +++++--
 src/resources/resetAudioSourceEntry.ui        |   2 +-
 src/resources/resetBluetooth.ui               | 111 +++-
 src/resources/resetInputStreamEntry.ui        |  68 +++
 src/resources/resetMainWindow.ui              |  12 +-
 src/resources/resetMicrophone.ui              | 224 +++++--
 src/resources/resetOutputStreamEntry.ui       |  68 +++
 src/resources/resetSavedWifiEntry.ui          |  22 +-
 src/resources/resetSettingBox.ui              |   9 +-
 src/resources/resetUI.cmb                     | 578 ++++++++++++------
 src/resources/resetWiFi.ui                    |  85 ++-
 src/resources/resetWifiEntry.ui               |   2 +-
 src/resources/resources.gresource.xml         |   4 +-
 src/resources/style/style.css                 |   2 +-
 36 files changed, 1380 insertions(+), 399 deletions(-)
 rename src/components/{audio/audioBox.rs => input/inputStreamEntry.rs} (60%)
 create mode 100644 src/components/input/inputStreamEntryImpl.rs
 create mode 100644 src/components/input/mod.rs
 create mode 100644 src/components/input/sourceBox.rs
 create mode 100644 src/components/input/sourceBoxImpl.rs
 create mode 100644 src/components/output/audioBox.rs
 rename src/components/{audio => output}/audioBoxImpl.rs (61%)
 rename src/components/{audio => output}/audioSource.rs (88%)
 rename src/components/{audio => output}/audioSourceImpl.rs (81%)
 rename src/components/{audio => output}/mod.rs (100%)
 create mode 100644 src/resources/resetInputStreamEntry.ui
 create mode 100644 src/resources/resetOutputStreamEntry.ui

diff --git a/src/components/base/settingBox.rs b/src/components/base/settingBox.rs
index bffe624..30b309c 100644
--- a/src/components/base/settingBox.rs
+++ b/src/components/base/settingBox.rs
@@ -1,21 +1,19 @@
 use crate::components::base::settingBoxImpl;
 use adw::glib;
 use adw::glib::{IsA, Object};
-use glib::subclass::prelude::ObjectSubclassIsExt;
-use gtk::prelude::FrameExt;
+use gtk::prelude::BoxExt;
 use gtk::Widget;
 
 glib::wrapper! {
     pub struct SettingBox(ObjectSubclass<settingBoxImpl::SettingBox>)
-    @extends gtk::Frame, gtk::Widget,
+    @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget;
 }
 
 impl SettingBox {
-    pub fn new(child: &impl IsA<Widget>, title: &str) -> Self {
+    pub fn new(child: &impl IsA<Widget>) -> Self {
         let entry: SettingBox = Object::builder().build();
-        entry.set_child(Some(child));
-        entry.imp().resetSettingLabel.set_text(title);
+        entry.append(child);
         entry
     }
 }
\ No newline at end of file
diff --git a/src/components/base/settingBoxImpl.rs b/src/components/base/settingBoxImpl.rs
index e895ab5..b0009f1 100644
--- a/src/components/base/settingBoxImpl.rs
+++ b/src/components/base/settingBoxImpl.rs
@@ -5,16 +5,13 @@ use crate::components::base::settingBox;
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")]
-pub struct SettingBox {
-    #[template_child]
-    pub resetSettingLabel: TemplateChild<Label>,
-}
+pub struct SettingBox {}
 
 #[glib::object_subclass]
 impl ObjectSubclass for SettingBox {
-    const NAME: &'static str = "resetSettingFrame";
+    const NAME: &'static str = "resetSettingBox";
     type Type = settingBox::SettingBox;
-    type ParentType = gtk::Frame;
+    type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -31,7 +28,7 @@ impl ObjectImpl for SettingBox {
     }
 }
 
-impl FrameImpl for SettingBox {}
+impl BoxImpl for SettingBox {}
 
 impl WidgetImpl for SettingBox {}
 
diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs
index 527795a..c746d2d 100644
--- a/src/components/bluetooth/bluetoothBox.rs
+++ b/src/components/bluetooth/bluetoothBox.rs
@@ -1,6 +1,8 @@
 use adw::glib;
 use adw::glib::Object;
 use adw::subclass::prelude::ObjectSubclassIsExt;
+use gtk::glib::Variant;
+use gtk::prelude::ActionableExt;
 
 use crate::components::bluetooth::bluetoothBoxImpl;
 use crate::components::bluetooth::bluetoothEntry::BluetoothEntry;
@@ -18,6 +20,14 @@ impl BluetoothBox {
         Object::builder().build()
     }
 
+    pub fn setupCallbacks(&self) {
+        let selfImp = self.imp();
+        selfImp.resetVisibility.set_action_name(Some("navigation.push"));
+        selfImp.resetVisibility.set_action_target_value(Some(&Variant::from("visibility")));
+
+        selfImp.resetBluetoothMainTab.set_action_name(Some("navigation.pop"));
+    }
+
     pub fn scanForDevices(&self) {
         let selfImp = self.imp();
         let mut wifiEntries = selfImp.availableDevices.borrow_mut();
diff --git a/src/components/bluetooth/bluetoothBoxImpl.rs b/src/components/bluetooth/bluetoothBoxImpl.rs
index 6d560fa..f2ebda5 100644
--- a/src/components/bluetooth/bluetoothBoxImpl.rs
+++ b/src/components/bluetooth/bluetoothBoxImpl.rs
@@ -17,6 +17,10 @@ pub struct BluetoothBox {
     pub resetBluetoothAvailableDevices: TemplateChild<ListBox>,
     #[template_child]
     pub resetBluetoothConnectedDevices: TemplateChild<ListBox>,
+    #[template_child]
+    pub resetVisibility: TemplateChild<ListEntry>,
+    #[template_child]
+    pub resetBluetoothMainTab: TemplateChild<ListEntry>,
     pub availableDevices: RefCell<Vec<ListEntry>>,
     pub connectedDevices: RefCell<Vec<ListEntry>>,
 }
@@ -42,6 +46,7 @@ impl ObjectImpl for BluetoothBox {
     fn constructed(&self) {
         self.parent_constructed();
         let obj = self.obj();
+        obj.setupCallbacks();
         obj.scanForDevices();
         obj.addConnectedDevices();
     }
diff --git a/src/components/bluetooth/bluetoothEntry.rs b/src/components/bluetooth/bluetoothEntry.rs
index bb02c8c..83d3e03 100644
--- a/src/components/bluetooth/bluetoothEntry.rs
+++ b/src/components/bluetooth/bluetoothEntry.rs
@@ -18,7 +18,7 @@ impl BluetoothEntry {
         entryImp.resetBluetoothDeviceType.get().set_from_icon_name(match deviceType {
             DeviceTypes::Mouse => Some("input-mouse-symbolic"),
             DeviceTypes::Keyboard => Some("input-keyboard-symbolic"),
-            DeviceTypes::Headset => Some("audio-headset-symbolic"),
+            DeviceTypes::Headset => Some("output-headset-symbolic"),
             DeviceTypes::Controller => Some("input-gaming-symbolic"),
             DeviceTypes::None => Some("text-x-generic-symbolic") // no generic bluetooth device icon found
         });
diff --git a/src/components/audio/audioBox.rs b/src/components/input/inputStreamEntry.rs
similarity index 60%
rename from src/components/audio/audioBox.rs
rename to src/components/input/inputStreamEntry.rs
index 1ab725f..97a1477 100644
--- a/src/components/audio/audioBox.rs
+++ b/src/components/input/inputStreamEntry.rs
@@ -1,14 +1,14 @@
+use crate::components::input::inputStreamEntryImpl;
 use adw::glib;
 use adw::glib::Object;
-use crate::components::audio::audioBoxImpl;
 
 glib::wrapper! {
-    pub struct AudioBox(ObjectSubclass<audioBoxImpl::AudioBox>)
+    pub struct InputStreamEntry(ObjectSubclass<inputStreamEntryImpl::InputStreamEntry>)
     @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-impl AudioBox {
+impl InputStreamEntry {
     pub fn new() -> Self {
         Object::builder().build()
     }
diff --git a/src/components/input/inputStreamEntryImpl.rs b/src/components/input/inputStreamEntryImpl.rs
new file mode 100644
index 0000000..34c377f
--- /dev/null
+++ b/src/components/input/inputStreamEntryImpl.rs
@@ -0,0 +1,40 @@
+use gtk::{Button, CompositeTemplate, glib, Label, ProgressBar, Scale};
+use gtk::subclass::prelude::*;
+use crate::components::input::inputStreamEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetInputStreamEntry.ui")]
+pub struct InputStreamEntry {
+    #[template_child]
+    pub resetSourceName: TemplateChild<Label>,
+    #[template_child]
+    pub resetSourceMute: TemplateChild<Button>,
+    #[template_child]
+    pub resetVolumeSlider: TemplateChild<Scale>,
+    #[template_child]
+    pub resetVolumePercentage: TemplateChild<Label>,
+    #[template_child]
+    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for InputStreamEntry {
+    const NAME: &'static str = "resetInputStreamEntry";
+    type Type = inputStreamEntry::InputStreamEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for InputStreamEntry {}
+
+impl ObjectImpl for InputStreamEntry {}
+
+impl WidgetImpl for InputStreamEntry {}
\ No newline at end of file
diff --git a/src/components/input/mod.rs b/src/components/input/mod.rs
new file mode 100644
index 0000000..5dc57f2
--- /dev/null
+++ b/src/components/input/mod.rs
@@ -0,0 +1,5 @@
+#![allow(non_snake_case)]
+pub mod inputStreamEntry;
+pub mod sourceBox;
+pub mod sourceBoxImpl;
+pub mod inputStreamEntryImpl;
\ No newline at end of file
diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs
new file mode 100644
index 0000000..d6d0714
--- /dev/null
+++ b/src/components/input/sourceBox.rs
@@ -0,0 +1,26 @@
+use crate::components::input::sourceBoxImpl;
+use adw::glib;
+use adw::glib::Object;
+use glib::subclass::prelude::ObjectSubclassIsExt;
+use glib::Variant;
+use gtk::prelude::ActionableExt;
+
+glib::wrapper! {
+    pub struct SourceBox(ObjectSubclass<sourceBoxImpl::SourceBox>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl SourceBox {
+    pub fn new() -> Self {
+        Object::builder().build()
+    }
+
+    pub fn setupCallbacks(&self) {
+        let selfImp = self.imp();
+        selfImp.resetSourceRow.set_action_name(Some("navigation.push"));
+        selfImp.resetSourceRow.set_action_target_value(Some(&Variant::from("sources")));
+
+        selfImp.resetInputStreamButton.set_action_name(Some("navigation.pop"));
+    }
+}
diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs
new file mode 100644
index 0000000..0189eac
--- /dev/null
+++ b/src/components/input/sourceBoxImpl.rs
@@ -0,0 +1,52 @@
+use gtk::{CompositeTemplate, DropDown, TemplateChild, glib};
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use crate::components::base::listEntry::ListEntry;
+use crate::components::input::inputStreamEntry::InputStreamEntry;
+use crate::components::input::sourceBox;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetMicrophone.ui")]
+pub struct SourceBox {
+    #[template_child]
+    pub resetSourceDropdown: TemplateChild<DropDown>,
+    #[template_child]
+    pub resetSourceRow: TemplateChild<ListEntry>,
+    #[template_child]
+    pub resetInputStreamButton: TemplateChild<ListEntry>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SourceBox {
+    const NAME: &'static str = "resetMicrophone";
+    type Type = sourceBox::SourceBox;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        InputStreamEntry::ensure_type();
+        ListEntry::ensure_type();
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for SourceBox {}
+
+impl ObjectImpl for SourceBox {
+    fn constructed(&self) {
+        let obj = self.obj();
+        obj.setupCallbacks();
+    }
+}
+
+impl ListBoxRowImpl for SourceBox {}
+
+impl WidgetImpl for SourceBox {}
+
+impl WindowImpl for SourceBox {}
+
+impl ApplicationWindowImpl for SourceBox {}
\ No newline at end of file
diff --git a/src/components/mod.rs b/src/components/mod.rs
index fb0f087..c4346eb 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -1,5 +1,6 @@
 pub mod window;
 pub mod wifi;
 pub mod bluetooth;
-pub mod audio;
-mod base;
\ No newline at end of file
+pub mod output;
+mod base;
+mod input;
\ No newline at end of file
diff --git a/src/components/output/audioBox.rs b/src/components/output/audioBox.rs
new file mode 100644
index 0000000..8c53aca
--- /dev/null
+++ b/src/components/output/audioBox.rs
@@ -0,0 +1,27 @@
+use adw::glib;
+use adw::glib::Object;
+use glib::subclass::prelude::ObjectSubclassIsExt;
+use glib::Variant;
+use gtk::prelude::ActionableExt;
+use crate::components::base::listEntry::ListEntry;
+use crate::components::output::audioBoxImpl;
+
+glib::wrapper! {
+    pub struct AudioBox(ObjectSubclass<audioBoxImpl::AudioBox>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl AudioBox {
+    pub fn new() -> Self {
+        Object::builder().build()
+    }
+
+    pub fn setupCallbacks(&self) {
+        let selfImp = self.imp();
+        selfImp.resetSinksRow.set_action_name(Some("navigation.push"));
+        selfImp.resetSinksRow.set_action_target_value(Some(&Variant::from("outputDevices")));
+
+        selfImp.resetOutputStreamButton.set_action_name(Some("navigation.pop"));
+    }
+}
diff --git a/src/components/audio/audioBoxImpl.rs b/src/components/output/audioBoxImpl.rs
similarity index 61%
rename from src/components/audio/audioBoxImpl.rs
rename to src/components/output/audioBoxImpl.rs
index 0e4a3b7..2da87c9 100644
--- a/src/components/audio/audioBoxImpl.rs
+++ b/src/components/output/audioBoxImpl.rs
@@ -1,8 +1,9 @@
-use gtk::{CompositeTemplate, DropDown, TemplateChild, glib};
+use gtk::{CompositeTemplate, DropDown, TemplateChild, glib, Button};
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use crate::components::audio::audioBox;
-use crate::components::audio::audioSource::AudioSourceEntry;
+use crate::components::output::audioBox;
+use crate::components::output::audioSource::AudioSourceEntry;
+use crate::components::base::listEntry::ListEntry;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
@@ -10,6 +11,10 @@ use crate::components::audio::audioSource::AudioSourceEntry;
 pub struct AudioBox {
     #[template_child]
     pub resetOutputDevice: TemplateChild<DropDown>,
+    #[template_child]
+    pub resetSinksRow: TemplateChild<ListEntry>,
+    #[template_child]
+    pub resetOutputStreamButton: TemplateChild<ListEntry>,
 }
 
 
@@ -21,6 +26,7 @@ impl ObjectSubclass for AudioBox {
 
     fn class_init(klass: &mut Self::Class) {
         AudioSourceEntry::ensure_type();
+        ListEntry::ensure_type();
         klass.bind_template();
     }
 
@@ -31,7 +37,12 @@ impl ObjectSubclass for AudioBox {
 
 impl BoxImpl for AudioBox {}
 
-impl ObjectImpl for AudioBox {}
+impl ObjectImpl for AudioBox {
+    fn constructed(&self) {
+        let obj = self.obj();
+        obj.setupCallbacks();
+    }
+}
 
 impl ListBoxRowImpl for AudioBox {}
 
diff --git a/src/components/audio/audioSource.rs b/src/components/output/audioSource.rs
similarity index 88%
rename from src/components/audio/audioSource.rs
rename to src/components/output/audioSource.rs
index 2743c03..a1d79ef 100644
--- a/src/components/audio/audioSource.rs
+++ b/src/components/output/audioSource.rs
@@ -1,6 +1,6 @@
 use adw::glib;
 use adw::glib::Object;
-use crate::components::audio::audioSourceImpl;
+use crate::components::output::audioSourceImpl;
 
 glib::wrapper! {
     pub struct AudioSourceEntry(ObjectSubclass<audioSourceImpl::AudioSourceEntry>)
diff --git a/src/components/audio/audioSourceImpl.rs b/src/components/output/audioSourceImpl.rs
similarity index 81%
rename from src/components/audio/audioSourceImpl.rs
rename to src/components/output/audioSourceImpl.rs
index ca5e177..13b4156 100644
--- a/src/components/audio/audioSourceImpl.rs
+++ b/src/components/output/audioSourceImpl.rs
@@ -1,13 +1,11 @@
 use gtk::{Button, CompositeTemplate, glib, Image, Label, ProgressBar, Scale};
 use gtk::subclass::prelude::*;
-use crate::components::audio::audioSource;
+use crate::components::output::audioSource;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetAudioSourceEntry.ui")]
+#[template(resource = "/org/Xetibo/ReSet/resetOutputStreamEntry.ui")]
 pub struct AudioSourceEntry {
-    #[template_child]
-    pub resetSourceIcon: TemplateChild<Image>,
     #[template_child]
     pub resetSourceName: TemplateChild<Label>,
     #[template_child]
@@ -22,7 +20,7 @@ pub struct AudioSourceEntry {
 
 #[glib::object_subclass]
 impl ObjectSubclass for AudioSourceEntry {
-    const NAME: &'static str = "resetAudioSourceEntry";
+    const NAME: &'static str = "resetOutputStreamEntry";
     type Type = audioSource::AudioSourceEntry;
     type ParentType = gtk::Box;
 
diff --git a/src/components/audio/mod.rs b/src/components/output/mod.rs
similarity index 100%
rename from src/components/audio/mod.rs
rename to src/components/output/mod.rs
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 9559042..0f27d52 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -1,24 +1,22 @@
+use std::collections::HashMap;
 use std::sync::mpsc::{channel, Receiver, Sender};
-use std::sync::{atomic::AtomicBool, Arc, Weak};
-use std::thread;
+use std::sync::{atomic::AtomicBool, Arc};
 use std::time::Duration;
 
 use crate::components::base::listEntry::ListEntry;
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::{BoxExt, ButtonExt, ListBoxRowExt};
+use adw::prelude::{BoxExt, ListBoxRowExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
+use dbus::arg::RefArg;
 use dbus::blocking::Connection;
 use dbus::Error;
 use dbus::Path;
 use gtk::glib::Variant;
 use gtk::prelude::ActionableExt;
-
-use gtk::{Button, Label, Orientation};
-use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
-use ReSet_Lib::signals::{
-    AccessPointAdded, AccessPointRemoved, BluetoothDeviceAdded, BluetoothDeviceRemoved,
-};
+use ReSet_Lib::network::network::AccessPoint;
+use ReSet_Lib::signals::AccessPointAdded;
+use ReSet_Lib::signals::AccessPointRemoved;
 use ReSet_Lib::utils::Events;
 
 use crate::components::wifi::wifiBoxImpl;
@@ -26,6 +24,8 @@ 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>)
     @extends gtk::Box, gtk::Widget,
@@ -42,9 +42,10 @@ impl WifiBox {
 
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
-
         selfImp.resetSavedNetworks.set_action_name(Some("navigation.push"));
-        selfImp.resetSavedNetworks.set_action_target_value(Some(&Variant::from("saved")))
+        selfImp.resetSavedNetworks.set_action_target_value(Some(&Variant::from("saved")));
+
+        selfImp.resetAvailableNetworks.set_action_name(Some("navigation.pop"));
     }
 
     // pub fn donotdisturb() {
@@ -173,3 +174,25 @@ pub async fn get_stored_connections() -> Vec<(Path<'static>, Vec<u8>)> {
     dbg!(connections.clone());
     connections
 }
+
+pub fn getConnectionSettings(path: Path<'static>) -> Option<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() {
+        println!("lol not work");
+        return None;
+    }
+    let (res,) = res.unwrap();
+    let res = ResetConnection::convert_from_propmap(res);
+    if res.is_err() {
+        println!("lol none");
+        return None;
+    }
+    Some(res.unwrap())
+}
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index 377b1c3..c0e2dbf 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -1,6 +1,5 @@
-use std::cell::RefCell;
 use std::sync::{Arc, Mutex};
-use gtk::{Button, CompositeTemplate, glib, ListBox, Switch};
+use gtk::{CompositeTemplate, glib, ListBox, Switch};
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use crate::components::wifi::wifiBox;
@@ -8,8 +7,6 @@ use crate::components::wifi::wifiBox;
 use crate::components::wifi::wifiEntry::WifiEntry;
 use crate::components::base::listEntry::ListEntry;
 
-use super::wifiBox::scanForWifi;
-
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
@@ -17,8 +14,6 @@ pub struct WifiBox {
     #[template_child]
     pub resetWifiDetails: TemplateChild<ListBox>,
     #[template_child]
-    pub resetWifiSwitchRow: TemplateChild<ListEntry>,
-    #[template_child]
     pub resetSavedNetworks: TemplateChild<ListEntry>,
     #[template_child]
     pub resetWifiSwitch: TemplateChild<Switch>,
@@ -26,6 +21,8 @@ pub struct WifiBox {
     pub resetWifiList: TemplateChild<ListBox>,
     #[template_child]
     pub resetStoredWifiList: TemplateChild<ListBox>,
+    #[template_child]
+    pub resetAvailableNetworks: TemplateChild<ListEntry>,
     pub wifiEntries: Arc<Mutex<Vec<ListEntry>>>,
     pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
 }
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 48daa74..ed29668 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -1,19 +1,21 @@
-use crate::components::base::popup::{self, Popup};
-use crate::components::wifi::wifiEntryImpl;
+use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
+use std::time::Duration;
+
 use adw::glib;
 use adw::glib::{Object, PropertySet};
 use adw::prelude::{ButtonExt, EditableExt, EntryExt, PopoverExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::Error;
-use glib::{clone, Cast};
+use glib::{Cast, clone};
+use gtk::{AlertDialog, GestureClick};
 use gtk::prelude::WidgetExt;
-use gtk::{AlertDialog, Editable, GestureClick, PasswordEntry, PasswordEntryBuffer, Window};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::time::Duration;
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 
+use crate::components::wifi::wifiBox::getConnectionSettings;
+use crate::components::wifi::wifiEntryImpl;
+
 glib::wrapper! {
     pub struct WifiEntry(ObjectSubclass<wifiEntryImpl::WifiEntry>)
         @extends gtk::Box, gtk::Widget,
@@ -75,6 +77,15 @@ impl WifiEntry {
         entry.add_controller(gesture);
         entry
     }
+
+    pub fn setupCallbacks(&self) {
+        let selfImp = self.imp();
+        selfImp.resetWifiEditButton.connect_clicked(clone!(@ weak selfImp => move |_| {
+            // TODO open navigationpage
+            let option = getConnectionSettings(selfImp.accessPoint.borrow().associated_connection.clone());
+            dbg!(option);
+        }));
+    }
 }
 
 pub fn click_stored_network(entry: Arc<WifiEntry>) {
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index 4807f18..c542bb7 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -16,7 +16,7 @@ pub struct WifiEntry {
     #[template_child]
     pub resetWifiLabel: TemplateChild<Label>,
     #[template_child]
-    pub resetWifiButton: TemplateChild<Button>,
+    pub resetWifiEditButton: TemplateChild<Button>,
     #[template_child]
     pub resetWifiConnected: TemplateChild<Image>,
     #[template_child]
@@ -49,6 +49,9 @@ impl ObjectSubclass for WifiEntry {
 impl ObjectImpl for WifiEntry {
     fn constructed(&self) {
         self.parent_constructed();
+
+        let obj = self.obj();
+        obj.setupCallbacks();
     }
 }
 
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index cd44978..274cc0c 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -1,39 +1,40 @@
+use gtk::prelude::FrameExt;
 use std::sync::Arc;
 
-use crate::components::audio::audioBox::AudioBox;
+use crate::components::output::audioBox::AudioBox;
 use crate::components::base::settingBox::SettingBox;
 use crate::components::bluetooth::bluetoothBox::BluetoothBox;
 use crate::components::wifi::wifiBox::{scanForWifi, show_stored_connections, WifiBox};
-use adw::prelude::ButtonExt;
-use glib::clone;
-use glib::subclass::types::ObjectSubclassIsExt;
-use gtk::{FlowBox, Label};
+use gtk::{FlowBox, Frame, Label,};
+use gtk::prelude::WidgetExt;
+use crate::components::input::sourceBox;
+use crate::components::input::sourceBox::SourceBox;
 
 pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
     let wifiBox = Arc::new(WifiBox::new());
     show_stored_connections(wifiBox.clone());
     scanForWifi(wifiBox.clone());
-    let wifiBox = SettingBox::new(&*wifiBox, "WiFi");
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
+    let wifiFrame = wrapInFrame(SettingBox::new(&*wifiBox));
+    let bluetoothFrame = wrapInFrame(SettingBox::new(&BluetoothBox::new()));
     resetMain.remove_all();
-    resetMain.insert(&wifiBox, -1);
-    resetMain.insert(&bluetoothBox, -1);
+    resetMain.insert(&wifiFrame, -1);
+    resetMain.insert(&bluetoothFrame, -1);
     resetMain.set_max_children_per_line(2);
 };
 
 pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifiBox = Arc::new(WifiBox::new());
     scanForWifi(wifiBox.clone());
-    let wifiBox = SettingBox::new(&*wifiBox, "WiFi");
+    let wifiFrame = wrapInFrame(SettingBox::new(&*wifiBox));
     resetMain.remove_all();
-    resetMain.insert(&wifiBox, -1);
+    resetMain.insert(&wifiFrame, -1);
     resetMain.set_max_children_per_line(1);
 };
 
 pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let bluetoothBox = SettingBox::new(&BluetoothBox::new(), "Bluetooth");
+    let bluetoothFrame = wrapInFrame(SettingBox::new(&BluetoothBox::new()));
     resetMain.remove_all();
-    resetMain.insert(&bluetoothBox, -1);
+    resetMain.insert(&bluetoothFrame, -1);
     resetMain.set_max_children_per_line(1);
 };
 
@@ -45,23 +46,25 @@ pub const HANDLE_VPN_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
 };
 
 pub const HANDLE_AUDIO_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
+    let audioFrame = wrapInFrame(SettingBox::new(&AudioBox::new()));
+    let sourceFrame = wrapInFrame(SettingBox::new(&SourceBox::new()));
     resetMain.remove_all();
-    resetMain.insert(&audioBox, -1);
-    resetMain.set_max_children_per_line(1);
+    resetMain.insert(&audioFrame, -1);
+    resetMain.insert(&sourceFrame, -1);
+    resetMain.set_max_children_per_line(2);
 };
 
 pub const HANDLE_VOLUME_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
-    let audioBox = SettingBox::new(&AudioBox::new(), "Audio");
+    let audioFrame = wrapInFrame(SettingBox::new(&AudioBox::new()));
     resetMain.remove_all();
-    resetMain.insert(&audioBox, -1);
+    resetMain.insert(&audioFrame, -1);
     resetMain.set_max_children_per_line(1);
 };
 
 pub const HANDLE_MICROPHONE_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
-    let label = Label::new(Some("not implemented yet"));
+    let sourceFrame = wrapInFrame(SettingBox::new(&SourceBox::new()));
     resetMain.remove_all();
-    resetMain.insert(&label, -1);
+    resetMain.insert(&sourceFrame, -1);
     resetMain.set_max_children_per_line(1);
 };
 
@@ -96,3 +99,10 @@ pub const HANDLE_KEYBOARD_CLICK: fn(FlowBox) = |resetMain: FlowBox| {
 pub const HANDLE_HOME: fn(FlowBox) =  |resetMain: FlowBox|   {
     resetMain.remove_all();
 };
+
+fn wrapInFrame(widget: SettingBox) -> Frame {
+    let frame = Frame::new(None);
+    frame.set_child(Some(&widget));
+    frame.add_css_class("resetSettingFrame");
+    frame
+}
diff --git a/src/components/window/window.rs b/src/components/window/window.rs
index e3e341b..e0da1ae 100644
--- a/src/components/window/window.rs
+++ b/src/components/window/window.rs
@@ -165,14 +165,14 @@ impl Window {
 
         let audioList = vec![
             SidebarEntry::new(
-                "Volume",
+                "Output",
                 "audio-volume-high-symbolic",
                 Categories::Audio,
                 true,
                 HANDLE_VOLUME_CLICK,
             ),
             SidebarEntry::new(
-                "Microphone",
+                "Input",
                 "audio-input-microphone-symbolic",
                 Categories::Audio,
                 true,
diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudio.ui
index c4286b5..8029770 100644
--- a/src/resources/resetAudio.ui
+++ b/src/resources/resetAudio.ui
@@ -1,56 +1,210 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
-  <requires lib="gtk" version="4.6"/>
+  <requires lib="gtk" version="4.12"/>
+  <requires lib="libadwaita" version="1.4"/>
   <template class="resetAudio" parent="GtkBox">
-    <property name="halign">center</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
-    <property name="width-request">400</property>
     <child>
-      <object class="GtkBox">
-        <property name="height-request">40</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Output Device</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkDropDown" id="resetOutputDevice">
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
+      <object class="GtkLabel">
+        <property name="css-classes">resetSettingLabel</property>
+        <property name="halign">start</property>
+        <property name="label">Output</property>
+        <property name="margin-start">5</property>
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="height-request">40</property>
-        <property name="margin-bottom">5</property>
+      <object class="AdwNavigationView">
         <child>
-          <object class="GtkLabel">
-            <property name="label">Show Applications</property>
+          <object class="AdwNavigationPage">
+            <property name="tag">output</property>
+            <child>
+              <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>
+                    <child>
+                      <object class="resetListBoxRow" id="resetSinksRow">
+                        <child>
+                          <object class="GtkBox">
+                            <property name="height-request">40</property>
+                            <property name="margin-start">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label">Output Device</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkDropDown" id="resetOutputDevice">
+                                <property name="halign">end</property>
+                                <property name="hexpand">True</property>
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="icon-name">go-previous-symbolic-rtl</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-start">5</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetDefaultSink">
+                    <property name="margin-bottom">10</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-top">10</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-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">5.0</property>
+                                <property name="upper">100.0</property>
+                              </object>
+                            </property>
+                            <property name="hexpand">True</property>
+                            <property name="valign">center</property>
+                            <property name="value-pos">bottom</property>
+                          </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>
+                <child>
+                  <object class="GtkSeparator"/>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetOutputStreams">
+                    <property name="margin-top">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="halign">start</property>
+                        <property name="label">Output Streams</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="resetOutputStreamEntry" id="resetDefaultSink_2"/>
+                    </child>
+                    <child>
+                      <object class="resetOutputStreamEntry" id="resetDefaultSink_3">
+                        <property name="margin-bottom">5</property>
+                        <property name="margin-top">5</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkSwitch">
-            <property name="active">True</property>
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
+          <object class="AdwNavigationPage">
+            <property name="tag">outputDevices</property>
+            <child>
+              <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>
+                    <child>
+                      <object class="resetListBoxRow" id="resetOutputStreamButton">
+                        <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>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel"/>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetSinks">
+                    <property name="margin-end">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-top">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="halign">start</property>
+                        <property name="label">Output Devices</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="resetOutputStreamEntry" id="resetDefaultSink_4"/>
+                    </child>
+                    <child>
+                      <object class="resetOutputStreamEntry" id="resetDefaultSink_5"/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkSeparator"/>
-    </child>
-    <child>
-      <object class="resetAudioSourceEntry" id="asdf">
-        <property name="margin-top">5</property>
-      </object>
-    </child>
   </template>
 </interface>
diff --git a/src/resources/resetAudioSourceEntry.ui b/src/resources/resetAudioSourceEntry.ui
index b9ecaac..f3b9c0c 100644
--- a/src/resources/resetAudioSourceEntry.ui
+++ b/src/resources/resetAudioSourceEntry.ui
@@ -17,7 +17,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="resetSourceName">
-            <property name="label">System Volume</property>
+            <property name="label">Master Volume</property>
           </object>
         </child>
       </object>
diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 09221e9..315ebdd 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -1,11 +1,32 @@
 <?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="resetBluetooth" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
+    <child>
+      <object class="GtkBox">
+        <property name="height-request">40</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="css-classes">resetSettingLabel</property>
+            <property name="label">Bluetooth</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="resetBluetoothSwitch">
+            <property name="active">True</property>
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="AdwNavigationView">
         <child>
@@ -18,27 +39,50 @@
                   <object class="GtkListBox" id="resetBluetoothDetails">
                     <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>
                     <child>
-                      <object class="resetListBoxRow" id="resetBluetoothSwitchRow">
+                      <object class="resetListBoxRow">
+                        <child>
+                          <object class="GtkBox">
+                            <property name="height-request">40</property>
+                            <property name="margin-start">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label">Bluetooth Device</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkDropDown" id="resetBluetoothDevice">
+                                <property name="halign">end</property>
+                                <property name="hexpand">True</property>
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="resetListBoxRow" id="resetVisibility">
                         <child>
                           <object class="GtkBox">
                             <property name="height-request">40</property>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label">Bluetooth</property>
+                                <property name="label">Visibility Settings</property>
                                 <property name="margin-start">5</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkSwitch" id="resetBluetoothSwitch">
-                                <property name="active">True</property>
+                              <object class="GtkImage">
                                 <property name="halign">end</property>
                                 <property name="hexpand">True</property>
+                                <property name="icon-name">go-previous-symbolic-rtl</property>
                                 <property name="margin-end">5</property>
-                                <property name="valign">center</property>
                               </object>
                             </child>
                           </object>
@@ -70,6 +114,7 @@
 </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>
@@ -104,6 +149,7 @@
 </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>
@@ -114,38 +160,55 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="action-name">navigation.push</property>
-                    <property name="action-target">'advanced'</property>
-                    <property name="halign">start</property>
-                    <property name="label">Advanced</property>
-                    <property name="margin-top">5</property>
-                    <property name="valign">start</property>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="AdwNavigationPage">
-            <property name="tag">advanced</property>
+            <property name="tag">visibility</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="label">advanced bluetooth</property>
+                  <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>
+                    <child>
+                      <object class="resetListBoxRow" id="resetBluetoothMainTab">
+                        <child>
+                          <object class="GtkBox">
+                            <property name="height-request">40</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label">Main</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>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton">
-                    <property name="action-name">navigation.pop</property>
+                  <object class="GtkLabel">
                     <property name="halign">start</property>
-                    <property name="label">Advanced</property>
-                    <property name="margin-top">5</property>
-                    <property name="valign">start</property>
+                    <property name="label">Visibility Settings</property>
+                    <property name="margin-start">5</property>
                   </object>
                 </child>
               </object>
diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui
new file mode 100644
index 0000000..a772a3f
--- /dev/null
+++ b/src/resources/resetInputStreamEntry.ui
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- 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>
+    <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>
+          </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>
+    </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">5.0</property>
+                <property name="upper">100.0</property>
+              </object>
+            </property>
+            <property name="hexpand">True</property>
+            <property name="valign">center</property>
+            <property name="value-pos">bottom</property>
+          </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>
+  </template>
+</interface>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index e7aae12..779ed80 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -98,18 +98,18 @@
                                     <property name="label">Shortcuts</property>
                                   </object>
                                 </child>
-                                <child>
-                                  <object class="GtkButton" id="resetAboutButton">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">About</property>
-                                  </object>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="resetPreferenceButton">
                                     <property name="has-frame">False</property>
                                     <property name="label">Preferences</property>
                                   </object>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" id="resetAboutButton">
+                                    <property name="has-frame">False</property>
+                                    <property name="label">About</property>
+                                  </object>
+                                </child>
                               </object>
                             </property>
                           </object>
diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetMicrophone.ui
index 1e5f6b4..20886cf 100644
--- a/src/resources/resetMicrophone.ui
+++ b/src/resources/resetMicrophone.ui
@@ -1,57 +1,201 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
-  <requires lib="gtk" version="4.6"/>
+  <requires lib="gtk" version="4.12"/>
+  <requires lib="libadwaita" version="1.4"/>
   <template class="resetMicrophone" parent="GtkBox">
-    <property name="halign">start</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
-    <property name="width-request">400</property>
     <child>
-      <object class="GtkBox">
-        <property name="height-request">40</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Input Device</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkDropDown" id="resetOutputDevice">
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
+      <object class="GtkLabel">
+        <property name="css-classes">resetSettingLabel</property>
+        <property name="halign">start</property>
+        <property name="label">Input</property>
+        <property name="margin-start">5</property>
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="height-request">40</property>
-        <property name="margin-bottom">5</property>
+      <object class="AdwNavigationView">
         <child>
-          <object class="GtkLabel">
-            <property name="label">Show Applications</property>
+          <object class="AdwNavigationPage">
+            <property name="tag">output</property>
+            <child>
+              <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>
+                    <child>
+                      <object class="resetListBoxRow" id="resetSourceRow">
+                        <child>
+                          <object class="GtkBox">
+                            <property name="height-request">40</property>
+                            <property name="margin-start">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label">Input Device</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkDropDown" id="resetSourceDropdown">
+                                <property name="halign">end</property>
+                                <property name="hexpand">True</property>
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="icon-name">go-previous-symbolic-rtl</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-start">5</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetDefaultSource">
+                    <property name="margin-bottom">10</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-top">10</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">5.0</property>
+                                <property name="upper">100.0</property>
+                              </object>
+                            </property>
+                            <property name="hexpand">True</property>
+                            <property name="valign">center</property>
+                            <property name="value-pos">bottom</property>
+                          </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>
+                <child>
+                  <object class="GtkSeparator"/>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetOutputStreams">
+                    <property name="margin-top">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="halign">start</property>
+                        <property name="label">Input Streams</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="resetInputStreamEntry"/>
+                    </child>
+                    <child>
+                      <object class="resetInputStreamEntry"/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkSwitch">
-            <property name="active">True</property>
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="margin-end">5</property>
-            <property name="valign">center</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparator"/>
-    </child>
-    <child>
-      <object class="GtkViewport">
-        <child>
-          <object class="resetMicEntry">
-            <property name="margin-top">5</property>
+          <object class="AdwNavigationPage">
+            <property name="tag">sources</property>
+            <child>
+              <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>
+                    <child>
+                      <object class="resetListBoxRow" id="resetInputStreamButton">
+                        <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>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox" id="resetSinks">
+                    <property name="margin-end">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-top">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="halign">start</property>
+                        <property name="label">Input Devices</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="resetInputStreamEntry"/>
+                    </child>
+                    <child>
+                      <object class="resetInputStreamEntry"/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui
new file mode 100644
index 0000000..80a9b58
--- /dev/null
+++ b/src/resources/resetOutputStreamEntry.ui
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- 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>
+    <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>
+          </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>
+    </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-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">5.0</property>
+                <property name="upper">100.0</property>
+              </object>
+            </property>
+            <property name="hexpand">True</property>
+            <property name="valign">center</property>
+            <property name="value-pos">bottom</property>
+          </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>
+  </template>
+</interface>
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
index 5827447..6fbdf98 100644
--- a/src/resources/resetSavedWifiEntry.ui
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -4,20 +4,24 @@
   <requires lib="gtk" version="4.12"/>
   <template class="resetSavedWifiEntry" parent="GtkBox">
     <property name="spacing">5</property>
+    <child>
+      <object class="GtkLabel" id="resetSavedWifiLabel">
+        <property name="margin-start">5</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="resetEditSavedWifiButton">
+        <property name="halign">end</property>
+        <property name="has-frame">False</property>
+        <property name="hexpand">True</property>
+        <property name="icon-name">document-edit-symbolic</property>
+      </object>
+    </child>
     <child>
       <object class="GtkButton" id="resetDeleteSavedWifiButton">
         <property name="has-frame">False</property>
         <property name="icon-name">user-trash-symbolic</property>
       </object>
     </child>
-    <child>
-      <object class="GtkButton" id="resetEditSavedWifiButton">
-        <property name="has-frame">False</property>
-        <property name="icon-name">document-edit-symbolic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="resetSavedWifiLabel"/>
-    </child>
   </template>
 </interface>
diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui
index 44c5edb..df8b1c9 100644
--- a/src/resources/resetSettingBox.ui
+++ b/src/resources/resetSettingBox.ui
@@ -2,14 +2,9 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <template class="resetSettingFrame" parent="GtkFrame">
-    <property name="css-classes">resetSettingFrame</property>
+  <template class="resetSettingBox" parent="GtkBox">
     <property name="halign">center</property>
-    <property name="label-widget">
-      <object class="GtkLabel" id="resetSettingLabel">
-        <property name="css-classes">resetSettingLabel</property>
-      </object>
-    </property>
+    <property name="orientation">vertical</property>
     <property name="width-request">500</property>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index e4d4749..447495d 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -6,13 +6,13 @@
 	(4,7,None,"resetWiFi.ui",None,None,None,None,None,None,None),
 	(5,2,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,"resetAudioSourceEntry.ui",None,None,None,None,None,None,None),
+	(7,1,None,"resetOutputStreamEntry.ui",None,None,None,None,None,None,None),
 	(8,1,None,"resetAudio.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,1,None,"resetMicrophone.ui",None,None,None,None,None,None,None),
-	(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
-	(14,2,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
+	(12,11,None,"resetMicrophone.ui",None,None,None,None,None,None,None),
+	(13,11,None,"resetInputStreamEntry.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,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
@@ -35,8 +35,8 @@
 	(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
 	(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
 	(3,36,"GtkBox",None,35,None,None,None,-1,None),
-	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,2,None),
-	(3,39,"GtkButton","resetAboutButton",36,None,None,None,1,None),
+	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None),
+	(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
 	(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
 	(3,41,"GtkViewport",None,40,None,None,None,None,None),
 	(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None),
@@ -50,35 +50,41 @@
 	(3,50,"GtkLabel",None,34,None,None,None,3,None),
 	(3,51,"GtkButton","resetShortcutsButton",36,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
-	(4,152,"AdwNavigationView",None,7,None,None,None,2,None),
+	(4,152,"AdwNavigationView",None,7,None,None,None,1,None),
 	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
 	(4,154,"GtkBox",None,153,None,None,None,None,None),
-	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,None,None),
-	(4,156,"resetListBoxRow","resetWifiSwitchRow",155,None,None,None,None,None),
-	(4,157,"GtkBox",None,156,None,None,None,None,None),
-	(4,158,"GtkLabel",None,157,None,None,None,None,None),
-	(4,159,"GtkSwitch","resetWifiSwitch",157,None,None,None,1,None),
-	(4,160,"resetListBoxRow","resetSavedNetworks",155,None,None,None,1,None),
-	(4,161,"GtkBox",None,160,None,None,None,None,None),
-	(4,162,"GtkLabel",None,161,None,None,None,None,None),
-	(4,163,"GtkImage",None,161,None,None,None,1,None),
-	(4,164,"GtkBox",None,154,None,None,None,1,None),
+	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,1,None),
+	(4,164,"GtkBox",None,154,None,None,None,2,None),
 	(4,165,"GtkLabel",None,164,None,None,None,None,None),
 	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
 	(4,167,"GtkViewport",None,166,None,None,None,None,None),
 	(4,168,"GtkListBox","resetWifiList",167,None,None,None,None,None),
 	(4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
 	(4,175,"GtkBox",None,174,None,None,None,None,None),
-	(4,178,"GtkListBox","resetStoredWifiList",175,None,None,None,3,None),
-	(4,179,"GtkBox",None,175,None,None,None,None,None),
-	(4,180,"GtkLabel",None,179,None,None,None,None,None),
-	(4,181,"GtkButton",None,179,None,None,None,1,None),
+	(4,178,"GtkListBox","resetStoredWifiList",175,None,None,None,2,None),
+	(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,190,"GtkLabel",None,175,None,None,None,1,None),
+	(4,191,"resetListBoxRow",None,155,None,None,None,1,None),
+	(4,192,"GtkBox",None,191,None,None,None,None,None),
+	(4,193,"GtkLabel",None,192,None,None,None,None,None),
+	(4,194,"GtkDropDown","resetWiFiDevice",192,None,None,None,1,None),
+	(4,195,"resetListBoxRow","resetSavedNetworks",155,None,None,None,1,None),
+	(4,196,"GtkBox",None,195,None,None,None,None,None),
+	(4,197,"GtkLabel",None,196,None,None,None,None,None),
+	(4,198,"GtkImage",None,196,None,None,None,1,None),
 	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
 	(5,3,"GtkBox",None,2,None,None,None,None,None),
 	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
 	(5,5,"GtkImage","resetWifiEncrypted",3,None,None,None,1,None),
 	(5,6,"GtkLabel","resetWifiLabel",2,None,None,None,1,None),
-	(5,7,"GtkButton","resetWifiButton",2,None,None,None,4,None),
+	(5,7,"GtkButton","resetWifiEditButton",2,None,None,None,4,None),
 	(5,8,"GtkImage","resetWifiConnected",2,None,None,None,3,None),
 	(5,10,"GtkImage","resetWifiStored",2,None,None,None,2,None),
 	(5,11,"resetPopup","resetWifiPopup",2,None,None,None,-1,None),
@@ -86,75 +92,134 @@
 	(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","resetAudioSourceEntry",None,None,None,None,-1,None),
+	(7,1,"GtkBox","resetOutputStreamEntry",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","resetSourceName",5,None,None,None,1,None),
-	(7,7,"GtkImage","resetSourceIcon",5,None,None,None,None,None),
+	(7,6,"GtkLabel","resetSourceName",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","resetSourceMute",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),
 	(8,1,"GtkBox","resetAudio",None,None,None,None,None,None),
-	(8,35,"GtkBox",None,1,None,None,None,2,None),
-	(8,36,"GtkLabel",None,35,None,None,None,None,None),
-	(8,37,"GtkDropDown","resetOutputDevice",35,None,None,None,1,None),
-	(8,38,"GtkBox",None,1,None,None,None,3,None),
-	(8,39,"GtkLabel",None,38,None,None,None,None,None),
-	(8,40,"GtkSwitch",None,38,None,None,None,1,None),
-	(8,41,"GtkSeparator",None,1,None,None,None,4,None),
-	(8,42,"resetAudioSourceEntry","asdf",1,None,None,None,5,None),
+	(8,53,"GtkLabel",None,1,None,None,None,None,None),
+	(8,54,"AdwNavigationView",None,1,None,None,None,1,None),
+	(8,55,"AdwNavigationPage",None,54,None,None,None,None,None),
+	(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,73,"GtkListBox",None,56,None,None,None,None,None),
+	(8,74,"resetListBoxRow","resetSinksRow",73,None,None,None,None,None),
+	(8,75,"GtkBox",None,74,None,None,None,None,None),
+	(8,76,"GtkLabel",None,75,None,None,None,None,None),
+	(8,77,"GtkDropDown","resetOutputDevice",75,None,None,None,1,None),
+	(8,78,"GtkImage",None,75,None,None,None,2,None),
+	(8,81,"GtkLabel",None,72,None,None,None,1,None),
+	(8,85,"GtkBox","resetOutputStreams",56,None,None,None,4,None),
+	(8,86,"GtkLabel",None,85,None,None,None,None,None),
+	(8,87,"resetOutputStreamEntry","resetDefaultSink_2",85,None,None,None,1,None),
+	(8,88,"resetOutputStreamEntry","resetDefaultSink_3",85,None,None,None,2,None),
+	(8,89,"GtkBox","resetSinks",72,None,None,None,3,None),
+	(8,90,"GtkLabel",None,89,None,None,None,None,None),
+	(8,91,"resetOutputStreamEntry","resetDefaultSink_4",89,None,None,None,1,None),
+	(8,92,"resetOutputStreamEntry","resetDefaultSink_5",89,None,None,None,2,None),
+	(8,93,"GtkBox","resetDefaultSink",56,None,None,None,2,None),
+	(8,97,"GtkBox",None,93,None,None,None,None,None),
+	(8,98,"GtkButton","resetSourceMute",97,None,None,None,None,None),
+	(8,99,"GtkScale","resetVolumeSlider",97,None,None,None,1,None),
+	(8,100,"GtkAdjustment",None,99,None,None,None,None,None),
+	(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","resetOutputStreamButton",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),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
-	(10,119,"AdwNavigationView",None,1,None,None,None,2,None),
+	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
 	(10,121,"GtkBox",None,120,None,None,None,None,None),
-	(10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,None,None),
-	(10,123,"resetListBoxRow","resetBluetoothSwitchRow",122,None,None,None,None,None),
-	(10,124,"GtkBox",None,123,None,None,None,None,None),
-	(10,125,"GtkLabel",None,124,None,None,None,None,None),
-	(10,126,"GtkSwitch","resetBluetoothSwitch",124,None,None,None,1,None),
-	(10,127,"GtkBox",None,121,None,None,None,1,None),
+	(10,122,"GtkListBox","resetBluetoothDetails",121,None,None,None,1,None),
+	(10,127,"GtkBox",None,121,None,None,None,2,None),
 	(10,128,"GtkLabel",None,127,None,None,None,None,None),
 	(10,129,"GtkScrolledWindow",None,127,None,None,None,1,None),
 	(10,130,"GtkViewport",None,129,None,None,None,None,None),
 	(10,131,"GtkListBox","resetBluetoothAvailableDevices",130,None,None,None,None,None),
-	(10,132,"GtkBox",None,121,None,None,None,2,None),
+	(10,132,"GtkBox",None,121,None,None,None,3,None),
 	(10,133,"GtkLabel",None,132,None,None,None,None,None),
 	(10,134,"GtkScrolledWindow",None,132,None,None,None,1,None),
 	(10,135,"GtkViewport",None,134,None,None,None,None,None),
 	(10,136,"GtkListBox","resetBluetoothConnectedDevices",135,None,None,None,None,None),
-	(10,137,"GtkButton",None,121,None,None,None,3,None),
 	(10,138,"AdwNavigationPage",None,119,None,None,None,1,None),
-	(10,139,"GtkBox",None,138,None,None,None,None,None),
-	(10,140,"GtkLabel",None,139,None,None,None,None,None),
-	(10,141,"GtkButton",None,139,None,None,None,1,None),
+	(10,142,"GtkBox",None,1,None,None,None,None,None),
+	(10,143,"GtkLabel",None,142,None,None,None,None,None),
+	(10,144,"GtkSwitch","resetBluetoothSwitch",142,None,None,None,1,None),
+	(10,153,"GtkBox",None,138,None,None,None,None,None),
+	(10,154,"GtkListBox",None,153,None,None,None,None,None),
+	(10,155,"resetListBoxRow","resetBluetoothMainTab",154,None,None,None,None,None),
+	(10,156,"GtkBox",None,155,None,None,None,None,None),
+	(10,157,"GtkLabel",None,156,None,None,None,None,None),
+	(10,158,"GtkImage",None,156,None,None,None,1,None),
+	(10,159,"GtkLabel",None,153,None,None,None,1,None),
+	(10,164,"resetListBoxRow",None,122,None,None,None,1,None),
+	(10,165,"GtkBox",None,164,None,None,None,None,None),
+	(10,166,"GtkLabel",None,165,None,None,None,None,None),
+	(10,167,"GtkDropDown","resetBluetoothDevice",165,None,None,None,1,None),
+	(10,168,"resetListBoxRow","resetVisibility",122,None,None,None,1,None),
+	(10,169,"GtkBox",None,168,None,None,None,None,None),
+	(10,170,"GtkLabel",None,169,None,None,None,None,None),
+	(10,171,"GtkImage",None,169,None,None,None,1,None),
 	(11,2,"GtkBox","resetBluetoothEntry",None,None,None,None,None,None),
 	(11,3,"GtkImage","resetBluetoothDeviceType",2,None,None,None,None,None),
 	(11,4,"GtkLabel","resetBluetoothLabel",2,None,None,None,1,None),
 	(11,5,"GtkButton","resetBluetoothButton",2,None,None,None,2,None),
-	(12,1,"GtkBox","resetMicrophone",None,None,None,None,None,None),
-	(12,2,"GtkBox",None,1,None,None,None,1,None),
-	(12,3,"GtkLabel",None,2,None,None,None,None,None),
-	(12,4,"GtkDropDown","resetOutputDevice",2,None,None,None,1,None),
-	(12,5,"GtkBox",None,1,None,None,None,2,None),
-	(12,6,"GtkLabel",None,5,None,None,None,None,None),
-	(12,7,"GtkSwitch",None,5,None,None,None,1,None),
-	(12,8,"GtkSeparator",None,1,None,None,None,3,None),
-	(12,9,"GtkViewport",None,1,None,None,None,4,None),
-	(12,10,"resetMicEntry",None,9,None,None,None,-1,None),
-	(13,1,"GtkBox","resetMicEntry",None,None,None,None,None,None),
-	(13,2,"GtkBox",None,1,None,None,None,None,None),
-	(13,3,"GtkImage","resetMicIcon",2,None,None,None,None,None),
-	(13,4,"GtkLabel","resetMicName",2,None,None,None,1,None),
-	(13,5,"GtkBox",None,1,None,None,None,1,None),
-	(13,6,"GtkButton","resetMicMute",5,None,None,None,None,None),
-	(13,7,"GtkScale","resetMicSlider",5,None,None,None,1,None),
-	(13,8,"GtkAdjustment",None,7,None,None,None,None,None),
-	(13,9,"GtkLabel","resetMicPercentage",5,None,None,None,2,None),
-	(13,10,"GtkProgressBar","resetMicMeter",1,None,None,None,2,None),
-	(14,2,"GtkFrame","resetSettingFrame",None,None,None,None,-1,None),
-	(14,3,"GtkLabel","resetSettingLabel",2,None,None,None,-1,None),
+	(12,11,"GtkBox","resetMicrophone",None,None,None,None,None,None),
+	(12,12,"GtkLabel",None,11,None,None,None,None,None),
+	(12,13,"AdwNavigationView",None,11,None,None,None,1,None),
+	(12,14,"AdwNavigationPage",None,13,None,None,None,None,None),
+	(12,15,"GtkBox",None,14,None,None,None,None,None),
+	(12,16,"GtkListBox",None,15,None,None,None,None,None),
+	(12,17,"resetListBoxRow","resetSourceRow",16,None,None,None,None,None),
+	(12,18,"GtkBox",None,17,None,None,None,None,None),
+	(12,19,"GtkLabel",None,18,None,None,None,None,None),
+	(12,20,"GtkDropDown","resetSourceDropdown",18,None,None,None,1,None),
+	(12,21,"GtkImage",None,18,None,None,None,2,None),
+	(12,22,"GtkBox","resetDefaultSource",15,None,None,None,1,None),
+	(12,23,"GtkBox",None,22,None,None,None,None,None),
+	(12,24,"GtkButton","resetSourceMute",23,None,None,None,None,None),
+	(12,25,"GtkScale","resetVolumeSlider",23,None,None,None,1,None),
+	(12,26,"GtkAdjustment",None,25,None,None,None,None,None),
+	(12,27,"GtkLabel","resetVolumePercentage",23,None,None,None,2,None),
+	(12,28,"GtkProgressBar","resetVolumeMeter",22,None,None,None,1,None),
+	(12,29,"GtkSeparator",None,15,None,None,None,2,None),
+	(12,30,"GtkBox","resetOutputStreams",15,None,None,None,3,None),
+	(12,31,"GtkLabel",None,30,None,None,None,None,None),
+	(12,34,"AdwNavigationPage",None,13,None,None,None,1,None),
+	(12,40,"resetInputStreamEntry",None,30,None,None,None,1,None),
+	(12,41,"resetInputStreamEntry",None,30,None,None,None,2,None),
+	(12,42,"GtkBox",None,34,None,None,None,None,None),
+	(12,43,"GtkListBox",None,42,None,None,None,1,None),
+	(12,44,"resetListBoxRow","resetInputStreamButton",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,49,"GtkBox","resetSinks",42,None,None,None,2,None),
+	(12,50,"GtkLabel",None,49,None,None,None,None,None),
+	(12,51,"resetInputStreamEntry",None,49,None,None,None,1,None),
+	(12,52,"resetInputStreamEntry",None,49,None,None,None,2,None),
+	(13,11,"GtkBox","resetInputStreamEntry",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,18,"GtkAdjustment",None,17,None,None,None,None,None),
+	(13,19,"GtkLabel","resetVolumePercentage",15,None,None,None,2,None),
+	(13,20,"GtkProgressBar","resetVolumeMeter",11,None,None,None,2,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),
 	(16,7,"GtkBox",None,6,None,None,None,None,None),
@@ -163,9 +228,9 @@
 	(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None),
 	(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None),
 	(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
-	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,2,None),
+	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,None,None),
 	(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
-	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
+	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,2,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -251,23 +316,10 @@
 	(4,155,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,155,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(4,155,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,157,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,158,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
-	(4,158,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,159,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,161,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,162,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
-	(4,162,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,163,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
-	(4,163,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,163,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,163,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,164,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
@@ -280,6 +332,7 @@
 	(4,168,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,168,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(4,168,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
 	(4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
@@ -288,14 +341,47 @@
 	(4,178,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
 	(4,178,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(4,178,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,178,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(4,178,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(4,180,"GtkLabel","label","saved networks",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkButton","label","back",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,181,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(4,182,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,183,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
+	(4,183,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(4,183,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,184,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(4,184,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(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,190,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
+	(4,190,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(4,190,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,192,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,192,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,193,"GtkLabel","label","WiFi Device",None,None,None,None,None,None,None,None,None),
+	(4,194,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,194,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,194,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(4,196,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(4,197,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
+	(4,197,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,198,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(4,198,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,198,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,198,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
@@ -326,12 +412,14 @@
 	(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","System Volume",None,None,None,None,None,None,None,None,None),
-	(7,7,"GtkImage","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
-	(7,7,"GtkWidget","margin-end","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,"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),
@@ -346,24 +434,81 @@
 	(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),
 	(8,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(8,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(8,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
-	(8,35,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,36,"GtkLabel","label","Output Device",None,None,None,None,None,None,None,None,None),
-	(8,37,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,37,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,37,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,38,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(8,38,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(8,39,"GtkLabel","label","Show Applications",None,None,None,None,None,None,None,None,None),
-	(8,40,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(8,40,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(8,40,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(8,40,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(8,40,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(8,42,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(8,53,"GtkLabel","label","Output",None,None,None,None,None,None,None,None,None),
+	(8,53,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(8,53,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(8,53,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,55,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None),
+	(8,56,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(8,71,"AdwNavigationPage","tag","outputDevices",None,None,None,None,None,None,None,None,None),
+	(8,72,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(8,73,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(8,75,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(8,75,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,76,"GtkLabel","label","Output Device",None,None,None,None,None,None,None,None,None),
+	(8,77,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(8,77,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,77,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(8,78,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(8,78,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,78,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,85,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(8,85,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(8,86,"GtkLabel","label","Output Streams",None,None,None,None,None,None,None,None,None),
+	(8,86,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(8,88,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(8,88,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(8,89,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(8,89,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,89,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,89,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(8,90,"GtkLabel","label","Output Devices",None,None,None,None,None,None,None,None,None),
+	(8,90,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(8,93,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(8,93,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(8,93,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,93,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(8,93,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(8,97,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(8,97,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(8,98,"GtkButton","icon-name","audio-volume-high-symbolic",None,None,None,None,None,None,None,None,None),
+	(8,98,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(8,98,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(8,99,"GtkRange","adjustment",None,None,None,None,None,100,None,None,None,None),
+	(8,99,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(8,99,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(8,99,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(8,100,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
+	(8,100,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
+	(8,101,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(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),
 	(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),
@@ -371,16 +516,10 @@
 	(10,122,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,122,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,124,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(10,125,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
-	(10,125,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(10,126,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(10,127,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,128,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
 	(10,128,"GtkLabel","label","Available devices",None,None,None,None,None,None,None,None,None),
@@ -392,6 +531,7 @@
 	(10,131,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
 	(10,131,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(10,131,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,131,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(10,131,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,132,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,132,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
@@ -405,21 +545,49 @@
 	(10,136,"GtkWidget","css-classes","boxed-list\n",None,None,None,None,None,None,None,None,None),
 	(10,136,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(10,136,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,136,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(10,136,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkActionable","action-name","navigation.push",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkActionable","action-target","'advanced'",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,137,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(10,138,"AdwNavigationPage","tag","advanced",None,None,None,None,None,None,None,None,None),
-	(10,139,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(10,140,"GtkLabel","label","advanced bluetooth",None,None,None,None,None,None,None,None,None),
-	(10,141,"GtkActionable","action-name","navigation.pop",None,None,None,None,None,None,None,None,None),
-	(10,141,"GtkButton","label","Advanced",None,None,None,None,None,None,None,None,None),
-	(10,141,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(10,141,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(10,141,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,138,"AdwNavigationPage","tag","visibility",None,None,None,None,None,None,None,None,None),
+	(10,142,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(10,143,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,144,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(10,153,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(10,154,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(10,156,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,157,"GtkLabel","label","Main",None,None,None,None,None,None,None,None,None),
+	(10,157,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,158,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(10,158,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,158,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,158,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(10,159,"GtkLabel","label","Visibility Settings",None,None,None,None,None,None,None,None,None),
+	(10,159,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(10,159,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,165,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,165,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,166,"GtkLabel","label","Bluetooth Device",None,None,None,None,None,None,None,None,None),
+	(10,167,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,167,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,167,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(10,169,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(10,170,"GtkLabel","label","Visibility Settings",None,None,None,None,None,None,None,None,None),
+	(10,170,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(10,171,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(10,171,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(10,171,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(10,171,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(11,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
@@ -432,50 +600,105 @@
 	(11,4,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
 	(11,5,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(11,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(12,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),
-	(12,2,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(12,3,"GtkLabel","label","Input Device",None,None,None,None,None,None,None,None,None),
-	(12,4,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(12,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(12,4,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(12,5,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(12,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(12,6,"GtkLabel","label","Show Applications",None,None,None,None,None,None,None,None,None),
-	(12,7,"GtkSwitch","active","True",None,None,None,None,None,None,None,None,None),
-	(12,7,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(12,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(12,7,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(12,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(12,10,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(13,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(13,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(13,2,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(13,3,"GtkImage","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(13,3,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,4,"GtkLabel","label","Input Volume",None,None,None,None,None,None,None,None,None),
-	(13,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
-	(13,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(13,6,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
-	(13,6,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(13,6,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,7,"GtkRange","adjustment",None,None,None,None,None,8,None,None,None,None),
-	(13,7,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
-	(13,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(13,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(13,8,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
-	(13,8,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
-	(13,9,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
-	(13,9,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
-	(13,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkFrame","label-widget",None,None,None,None,None,3,None,None,None,None),
-	(14,2,"GtkWidget","css-classes","resetSettingFrame",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
-	(14,2,"GtkWidget","width-request","500",None,None,None,None,None,None,None,None,None),
-	(14,3,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(12,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(12,11,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(12,12,"GtkLabel","label","Input",None,None,None,None,None,None,None,None,None),
+	(12,12,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
+	(12,12,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(12,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(12,14,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None),
+	(12,15,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(12,16,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(12,18,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
+	(12,18,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(12,19,"GtkLabel","label","Input Device",None,None,None,None,None,None,None,None,None),
+	(12,20,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(12,20,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(12,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(12,21,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(12,21,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(12,21,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(12,22,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(12,22,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
+	(12,22,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(12,22,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(12,22,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(12,23,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
+	(12,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(12,24,"GtkButton","icon-name","audio-input-microphone-symbolic",None,None,None,None,None,None,None,None,None),
+	(12,24,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(12,24,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(12,25,"GtkRange","adjustment",None,None,None,None,None,26,None,None,None,None),
+	(12,25,"GtkScale","value-pos","bottom",None,None,None,None,None,None,None,None,None),
+	(12,25,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(12,25,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(12,26,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
+	(12,26,"GtkAdjustment","upper","100.0",None,None,None,None,None,None,None,None,None),
+	(12,27,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
+	(12,27,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
+	(12,27,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
+	(12,28,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(12,30,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(12,30,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(12,31,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None),
+	(12,31,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(12,34,"AdwNavigationPage","tag","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),
+	(12,49,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(12,50,"GtkLabel","label","Input Devices",None,None,None,None,None,None,None,None,None),
+	(12,50,"GtkWidget","halign","start",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,"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,18,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,18,"GtkAdjustment","page-increment","5.0",None,None,None,None,None,None,None,None,None),
+	(13,18,"GtkAdjustment","upper","100.0",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),
+	(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),
 	(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
@@ -494,8 +717,11 @@
 	(16,12,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(16,13,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
 	(17,1,"GtkBox","spacing","5",None,None,None,None,None,None,None,None,None),
+	(17,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(17,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(17,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(17,3,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None)
   </object_property>
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index 9bcda9d..227b0ae 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -1,13 +1,34 @@
 <?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>
     <property name="hexpand-set">True</property>
     <property name="orientation">vertical</property>
     <property name="valign">start</property>
+    <child>
+      <object class="GtkBox">
+        <property name="height-request">40</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="css-classes">resetSettingLabel</property>
+            <property name="label">WiFi</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="resetWifiSwitch">
+            <property name="active">True</property>
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="margin-end">5</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+      </object>
+    </child>
     <child>
       <object class="AdwNavigationView">
         <child>
@@ -20,26 +41,26 @@
                   <object class="GtkListBox" id="resetWifiDetails">
                     <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>
                     <child>
-                      <object class="resetListBoxRow" id="resetWifiSwitchRow">
+                      <object class="resetListBoxRow">
                         <child>
                           <object class="GtkBox">
                             <property name="height-request">40</property>
+                            <property name="margin-start">5</property>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label">WiFi</property>
-                                <property name="margin-start">5</property>
+                                <property name="label">WiFi Device</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkSwitch" id="resetWifiSwitch">
-                                <property name="active">True</property>
+                              <object class="GtkDropDown" id="resetWiFiDevice">
                                 <property name="halign">end</property>
                                 <property name="hexpand">True</property>
-                                <property name="margin-end">5</property>
                                 <property name="valign">center</property>
                               </object>
                             </child>
@@ -95,6 +116,7 @@
                                 <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>
@@ -116,30 +138,53 @@
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox">
+                  <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>
                     <child>
-                      <object class="GtkLabel">
-                        <property name="label">saved networks</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="action-name">navigation.pop</property>
-                        <property name="halign">start</property>
-                        <property name="label">back</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-top">5</property>
-                        <property name="valign">start</property>
+                      <object class="resetListBoxRow" id="resetAvailableNetworks">
+                        <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>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="halign">start</property>
+                    <property name="label">Saved Networks</property>
+                    <property name="margin-start">5</property>
+                  </object>
+                </child>
                 <child>
                   <object class="GtkListBox" id="resetStoredWifiList">
                     <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>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index 6b1d6a9..77c46f0 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -50,7 +50,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkButton" id="resetWifiButton">
+      <object class="GtkButton" id="resetWifiEditButton">
         <property name="halign">start</property>
         <property name="has-frame">False</property>
         <property name="icon-name">info-symbolic</property>
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index 9cb6eba..f92e85b 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -11,9 +11,9 @@
     <file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetOutputStreamEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetMicrophone.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">resetMicSourceEntry.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetInputStreamEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
   </gresource>
 </gresources>
diff --git a/src/resources/style/style.css b/src/resources/style/style.css
index 0523285..2631daf 100644
--- a/src/resources/style/style.css
+++ b/src/resources/style/style.css
@@ -16,7 +16,7 @@ frame.resetSettingFrame {
     padding: 10px;
 }
 
-frame > label {
+label.resetSettingLabel {
     font-size: 32px;
     font-weight: bold;
 }